This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 20b99ca2dad1a39186f0d6b89a821275deda5941 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 14:00:14 2014 +0100 Rename icon files to match default application name (PyHoca-GUI). --- debian/changelog | 1 + .../PyHoca/128x128/PyHoca-GUI_trayicon.png | Bin 19982 -> 19982 bytes .../PyHoca/128x128/PyHoca-GUI_winicon.png | Bin 19982 -> 19982 bytes .../PyHoca/16x16/PyHoca-GUI_trayicon.png | Bin 1099 -> 1099 bytes .../PyHoca/16x16/PyHoca-GUI_winicon.png | Bin 1099 -> 1099 bytes .../PyHoca/22x22/PyHoca-GUI_trayicon.png | Bin 1519 -> 1519 bytes .../PyHoca/22x22/PyHoca-GUI_winicon.png | Bin 1519 -> 1519 bytes .../PyHoca/32x32/PyHoca-GUI_trayicon.png | Bin 2621 -> 2621 bytes .../PyHoca/32x32/PyHoca-GUI_winicon.png | Bin 2621 -> 2621 bytes .../PyHoca/48x48/PyHoca-GUI_trayicon.png | Bin 5073 -> 5073 bytes .../PyHoca/48x48/PyHoca-GUI_winicon.png | Bin 5073 -> 5073 bytes .../PyHoca/64x64/PyHoca-GUI_trayicon.png | Bin 7923 -> 7923 bytes .../PyHoca/64x64/PyHoca-GUI_winicon.png | Bin 7923 -> 7923 bytes .../PyHoca/scalable/PyHoca-GUI_sessionicon.svg | 0 .../PyHoca/scalable/PyHoca-GUI_trayicon.svg | 0 .../PyHoca/scalable/PyHoca-GUI_winicon.svg | 0 ...pyhoca-trayicon.png => PyHoca-GUI_trayicon.png} | Bin 19982 -> 19982 bytes ...{pyhoca-trayicon.png => PyHoca-GUI_winicon.png} | Bin 19982 -> 19982 bytes ...pyhoca-trayicon.png => PyHoca-GUI_trayicon.png} | Bin 1099 -> 1099 bytes ...{pyhoca-trayicon.png => PyHoca-GUI_winicon.png} | Bin 1099 -> 1099 bytes ...pyhoca-trayicon.png => PyHoca-GUI_trayicon.png} | Bin 1519 -> 1519 bytes ...{pyhoca-trayicon.png => PyHoca-GUI_winicon.png} | Bin 1519 -> 1519 bytes ...pyhoca-trayicon.png => PyHoca-GUI_trayicon.png} | Bin 2621 -> 2621 bytes ...{pyhoca-trayicon.png => PyHoca-GUI_winicon.png} | Bin 2621 -> 2621 bytes ...pyhoca-trayicon.png => PyHoca-GUI_trayicon.png} | Bin 5073 -> 5073 bytes ...{pyhoca-trayicon.png => PyHoca-GUI_winicon.png} | Bin 5073 -> 5073 bytes ...pyhoca-trayicon.png => PyHoca-GUI_trayicon.png} | Bin 7923 -> 7923 bytes ...{pyhoca-trayicon.png => PyHoca-GUI_winicon.png} | Bin 7923 -> 7923 bytes .../{pyhoca-session.svg => PyHoca-GUI_session.svg} | 0 ...{pyhoca-session.svg => PyHoca-GUI_trayicon.svg} | 0 .../{pyhoca-session.svg => PyHoca-GUI_winicon.svg} | 0 31 files changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 7b64f8b..b5dc5e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low named PyHocaGUI_Launcher. * Allow automatic image branding (splash, about image, tray icon) by setting another application name than the default. + * Rename icon files to match default application name (PyHoca-GUI). * Make default cmdline option parameters overridable before the arg parser gets initialized. * Make SCRIPT_NAME in setup.py configurable (monkey-patchable). diff --git a/icons_symlinked/PyHoca/128x128/pyhoca-trayicon.png b/icons/PyHoca/128x128/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/128x128/pyhoca-trayicon.png copy to icons/PyHoca/128x128/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/128x128/pyhoca-winicon.png b/icons/PyHoca/128x128/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/128x128/pyhoca-winicon.png rename to icons/PyHoca/128x128/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/16x16/pyhoca-trayicon.png b/icons/PyHoca/16x16/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/16x16/pyhoca-trayicon.png copy to icons/PyHoca/16x16/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/16x16/pyhoca-winicon.png b/icons/PyHoca/16x16/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/16x16/pyhoca-winicon.png rename to icons/PyHoca/16x16/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/22x22/pyhoca-trayicon.png b/icons/PyHoca/22x22/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/22x22/pyhoca-trayicon.png copy to icons/PyHoca/22x22/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/22x22/pyhoca-winicon.png b/icons/PyHoca/22x22/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/22x22/pyhoca-winicon.png rename to icons/PyHoca/22x22/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/32x32/pyhoca-trayicon.png b/icons/PyHoca/32x32/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/32x32/pyhoca-trayicon.png copy to icons/PyHoca/32x32/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/32x32/pyhoca-winicon.png b/icons/PyHoca/32x32/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/32x32/pyhoca-winicon.png rename to icons/PyHoca/32x32/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/48x48/pyhoca-trayicon.png b/icons/PyHoca/48x48/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/48x48/pyhoca-trayicon.png copy to icons/PyHoca/48x48/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/48x48/pyhoca-winicon.png b/icons/PyHoca/48x48/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/48x48/pyhoca-winicon.png rename to icons/PyHoca/48x48/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/64x64/pyhoca-trayicon.png b/icons/PyHoca/64x64/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/64x64/pyhoca-trayicon.png copy to icons/PyHoca/64x64/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/64x64/pyhoca-winicon.png b/icons/PyHoca/64x64/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/64x64/pyhoca-winicon.png rename to icons/PyHoca/64x64/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/scalable/pyhoca-session.svg b/icons/PyHoca/scalable/PyHoca-GUI_sessionicon.svg similarity index 100% copy from icons_symlinked/PyHoca/scalable/pyhoca-session.svg copy to icons/PyHoca/scalable/PyHoca-GUI_sessionicon.svg diff --git a/icons_symlinked/PyHoca/scalable/pyhoca-trayicon.svg b/icons/PyHoca/scalable/PyHoca-GUI_trayicon.svg similarity index 100% rename from icons_symlinked/PyHoca/scalable/pyhoca-trayicon.svg rename to icons/PyHoca/scalable/PyHoca-GUI_trayicon.svg diff --git a/icons_symlinked/PyHoca/scalable/pyhoca-winicon.svg b/icons/PyHoca/scalable/PyHoca-GUI_winicon.svg similarity index 100% rename from icons_symlinked/PyHoca/scalable/pyhoca-winicon.svg rename to icons/PyHoca/scalable/PyHoca-GUI_winicon.svg diff --git a/icons_symlinked/PyHoca/128x128/pyhoca-trayicon.png b/icons_symlinked/PyHoca/128x128/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/128x128/pyhoca-trayicon.png copy to icons_symlinked/PyHoca/128x128/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/128x128/pyhoca-trayicon.png b/icons_symlinked/PyHoca/128x128/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/128x128/pyhoca-trayicon.png rename to icons_symlinked/PyHoca/128x128/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/16x16/pyhoca-trayicon.png b/icons_symlinked/PyHoca/16x16/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/16x16/pyhoca-trayicon.png copy to icons_symlinked/PyHoca/16x16/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/16x16/pyhoca-trayicon.png b/icons_symlinked/PyHoca/16x16/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/16x16/pyhoca-trayicon.png rename to icons_symlinked/PyHoca/16x16/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/22x22/pyhoca-trayicon.png b/icons_symlinked/PyHoca/22x22/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/22x22/pyhoca-trayicon.png copy to icons_symlinked/PyHoca/22x22/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/22x22/pyhoca-trayicon.png b/icons_symlinked/PyHoca/22x22/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/22x22/pyhoca-trayicon.png rename to icons_symlinked/PyHoca/22x22/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/32x32/pyhoca-trayicon.png b/icons_symlinked/PyHoca/32x32/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/32x32/pyhoca-trayicon.png copy to icons_symlinked/PyHoca/32x32/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/32x32/pyhoca-trayicon.png b/icons_symlinked/PyHoca/32x32/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/32x32/pyhoca-trayicon.png rename to icons_symlinked/PyHoca/32x32/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/48x48/pyhoca-trayicon.png b/icons_symlinked/PyHoca/48x48/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/48x48/pyhoca-trayicon.png copy to icons_symlinked/PyHoca/48x48/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/48x48/pyhoca-trayicon.png b/icons_symlinked/PyHoca/48x48/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/48x48/pyhoca-trayicon.png rename to icons_symlinked/PyHoca/48x48/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/64x64/pyhoca-trayicon.png b/icons_symlinked/PyHoca/64x64/PyHoca-GUI_trayicon.png similarity index 100% copy from icons_symlinked/PyHoca/64x64/pyhoca-trayicon.png copy to icons_symlinked/PyHoca/64x64/PyHoca-GUI_trayicon.png diff --git a/icons_symlinked/PyHoca/64x64/pyhoca-trayicon.png b/icons_symlinked/PyHoca/64x64/PyHoca-GUI_winicon.png similarity index 100% rename from icons_symlinked/PyHoca/64x64/pyhoca-trayicon.png rename to icons_symlinked/PyHoca/64x64/PyHoca-GUI_winicon.png diff --git a/icons_symlinked/PyHoca/scalable/pyhoca-session.svg b/icons_symlinked/PyHoca/scalable/PyHoca-GUI_session.svg similarity index 100% copy from icons_symlinked/PyHoca/scalable/pyhoca-session.svg copy to icons_symlinked/PyHoca/scalable/PyHoca-GUI_session.svg diff --git a/icons_symlinked/PyHoca/scalable/pyhoca-session.svg b/icons_symlinked/PyHoca/scalable/PyHoca-GUI_trayicon.svg similarity index 100% copy from icons_symlinked/PyHoca/scalable/pyhoca-session.svg copy to icons_symlinked/PyHoca/scalable/PyHoca-GUI_trayicon.svg diff --git a/icons_symlinked/PyHoca/scalable/pyhoca-session.svg b/icons_symlinked/PyHoca/scalable/PyHoca-GUI_winicon.svg similarity index 100% rename from icons_symlinked/PyHoca/scalable/pyhoca-session.svg rename to icons_symlinked/PyHoca/scalable/PyHoca-GUI_winicon.svg -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit c44a152e90dc3b29c1696f047c67952b7bf2b103 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 13:38:21 2014 +0100 CVix: import CVix specific code --- CVix.py | 390 ++++++++++++++++++++++++++++++++++++++++++++ CVix/CVix_initemplate.py | 61 +++++++ CVix/icons/16x16/CVix.png | Bin 0 -> 486 bytes CVix/icons/22x22/CVix.png | Bin 0 -> 554 bytes CVix/img/CVix.png | Bin 0 -> 3956205 bytes CVix/img/cvix_about.png | Bin 0 -> 61359 bytes CVix/nsis_template_CVix.py | 220 +++++++++++++++++++++++++ CVix/pixmaps/CVix.ico | Bin 0 -> 29686 bytes setup_CVix.py | 389 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 1060 insertions(+) diff --git a/CVix.py b/CVix.py new file mode 100755 index 0000000..6d568cd --- /dev/null +++ b/CVix.py @@ -0,0 +1,390 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep@lindix.nl> +# +# PyHoca GUI 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. +# +# PyHoca GUI 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. + +modules ={} + +import os.path +import subprocess +import sys +import wxversion + +try: + wxversion.select('2.9') +except: pass +try: + wxversion.select('2.8') +except: pass +import wx +import argparse + +import logging, logging.handlers +import os +import ConfigParser +import getpass + +import CVix.CVix_initemplate + +from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS +from x2go import X2goSessionProfiles + +# Python X2Go modules +from x2go import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER +from x2go import X2goLogger as _X2goLogger + +# X2Go backends + +from pyhoca.wxgui import __VERSION__ as _version +from pyhoca.wxgui import messages +from pyhoca.wxgui.basepath import locale_basepath +from pyhoca.wxgui import PyHocaGUI + +if _X2GOCLIENT_OS == "Windows": + from x2go import X2GoClientXConfig as _X2GoClientXConfig + +__author__ = "Mike Gabriel, Dick Kniep" +__version__ = _version + +PROG_NAME = os.path.basename(sys.argv[0]).replace('.exe', '').replace('.py', '') +PROG_PID = os.getpid() + +# version information +VERSION=_version +VERSION_TEXT=""" +%s[%s] - an X2Go GUI client written in Python +---------------------------------------------------------------------- +developed by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +sponsored by Dick Kniep <dick.kniep@lindix.nl> (2010-2012) + +VERSION: %s + +""" % (PROG_NAME, PROG_PID, VERSION) + + +if _X2GOCLIENT_OS == 'Windows': + import _winreg + +SESSIONDIR = '.x2goclient' + +ProgramFiles = None +if hasattr(sys, 'frozen') and sys.frozen in ("windows_exe", "console_exe"): + class Win32_Logging(object): + + softspace = 0 + _fname = os.path.join(os.environ['AppData'], PROG_NAME, '%s.log' % PROG_NAME) + _file = None + + def __init__(self, filemode='a'): + self._filemode = filemode + + def write(self, text, **kwargs): + if self._file is None: + try: + try: + os.mkdir(os.path.dirname(self._fname)) + except: + pass + self._file = open(self._fname, self._filemode) + except: + pass + else: + self._file.write(text) + self._file.flush() + + def flush(self): + if self._file is not None: + self._file.flush() + + sys.stdout = Win32_Logging(filemode='w+') + sys.stderr = Win32_Logging(filemode='a') + del Win32_Logging + + try: + OK = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,'SOFTWARE\\CVix') + except WindowsError: + m = messages.PyHoca_MessageWindow_Ok(wx.App(), shortmsg='ALREADY_RUNNING', msg='CVix niet opgeslagen in register, waarschijnlijk is de installatie niet gelukt.', title=u'PyHoca-GUI (%s)...' % VERSION, icon='pyhoca-trayicon') + m.ShowModal() + sys.exit(1) + + ProgramFiles, Regtype = _winreg.QueryValueEx(OK, 'Install_Dir') + +import gevent +import gevent.monkey +gevent.monkey.patch_all() +import gettext + + +if _X2GOCLIENT_OS in ('Linux', 'Mac'): + import setproctitle + setproctitle.setproctitle(PROG_NAME) + +if sys.argv[0].startswith('./') or sys.argv[0].startswith('python') or sys.argv[1] == '--debug' or (os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1'): + sys.path.insert(0, os.getcwd()) + os.environ['PYHOCAGUI_DEVELOPMENT'] = '1' + ProgramFiles = os.getcwd() + print '### PyHoca-GUI running in development mode ###' + +if not ProgramFiles: + ProgramFiles = '/Program Files/%s' % PROG_NAME + +f = open(os.path.join('CVix', 'customer'), 'r') +CUSTOMER_HOST = f.read().replace('\n', '').replace('\r', '') +f.close() +CUSTOMER_USER = CUSTOMER_HOST.split('.')[0] +CUSTOMER_KEY = 'CVix/keys/%s.key' % CUSTOMER_USER + +if _X2GOCLIENT_OS == 'Windows': + from pyhoca.wxgui.basepath import nxproxy_binary + os.environ.update({'NXPROXY_BINARY': nxproxy_binary, }) + +def check_running(): + if _X2GOCLIENT_OS in ('Linux', 'Mac'): + p = subprocess.Popen(['ps', '-A'], stdout=subprocess.PIPE) + psA_out = p.communicate() + return psA_out[0].count(PROG_NAME) > 1 + elif _X2GOCLIENT_OS == 'Windows': + import wmi + w = wmi.WMI() + _p_names = [] + for process in w.Win32_Process(): + _p_names.append(process.Name) + return len([ _p_name for _p_name in _p_names if _p_name == PROG_NAME]) > 1 + +def configFile(ProgramFiles): + + bdir = os.path.join(os.path.normpath(os.path.expanduser('~')), SESSIONDIR) + sessionFile = os.path.join(bdir, 'sessions') + + session_profiles = X2goSessionProfiles(config_files=[sessionFile]) + + found = False + if 'CVix' in session_profiles.profile_names: + found = True + + if not found: + + profile_config = CVix.CVix_initemplate.SESSION_PROFILE_TEMPLATE + customized_config = { + 'sshproxyhost': '{hostname}'.format(hostname=CUSTOMER_HOST), + 'sshproxyport': 3389, + 'sshproxyuser': CUSTOMER_USER, + 'sshproxykeyfile': os.path.join(ProgramFiles, CUSTOMER_KEY), + 'icon': os.path.join(ProgramFiles, 'CVix', 'pixmaps', 'CVix.ico'), + 'user': getpass.getuser(), + } + profile_config['export'] = profile_config['export'].format(local_home=os.path.normpath(os.path.expanduser('~'))) + profile_config.update(customized_config) + + session_profiles.add_profile(profile_id=None, **profile_config) + + session_profiles.write_user_config = True + session_profiles.write() + + +class args: + def __init__(self, session_profile='CVix', debug=True, quiet=False, libdebug=True, libdebug_sftpxfer=True, version=False, + remember_username=True, non_interactive=True, auto_connect=False, show_profile_metatypes=False, single_session_profile=False, + tray_icon='CVix', tray_icon_connecting=None, add_to_known_hosts=True, + restricted_trayicon=False, start_on_connect=False, exit_on_disconnect=False, resume_newest_on_connect=True, resume_oldest_on_connect=False, + resume_all_on_connect=False, disconnect_on_suspend=False, disconnect_on_terminate=False, + splash_image=None, disable_splash=True, disable_options=False, + disable_printingprefs=False, disable_profilemanager=False, disable_notifications=False, display=None, logon_window_position=None, + published_applications_no_submenus=10, lang='nl', backend_controlsession=None, backend_terminalsession=None, backend_serversessioninfo=None, + backend_serversessionlist=None, backend_proxy=None, backend_sessionprofiles=None, backend_clientsettings=None, backend_clientprinting=None, + start_xserver=True, preferred_xserver=None, start_pulseaudio=False, client_rootdir=None, sessions_rootdir=None, ssh_rootdir=None,about_image='cvix_about.png'): + self.start_xserver = start_xserver + self.client_rootdir = client_rootdir + self.sessions_rootdir = sessions_rootdir + self.ssh_rootdir = ssh_rootdir + self.preferred_xserver = preferred_xserver + self.start_pulseaudio = start_pulseaudio + self.session_profile = session_profile + self.add_to_known_hosts = add_to_known_hosts + self.debug = debug + self.quiet = quiet + self.libdebug = libdebug + self.libdebug_sftpxfer = libdebug_sftpxfer + self.version = version + self.remember_username = remember_username + self.non_interactive = non_interactive + self.auto_connect = auto_connect + self.show_profile_metatypes = show_profile_metatypes + self.single_session_profile = single_session_profile + self.tray_icon = tray_icon + self.tray_icon_connecting = tray_icon_connecting + self.restricted_trayicon = restricted_trayicon + self.start_on_connect = start_on_connect + self.exit_on_disconnect = exit_on_disconnect + self.resume_newest_on_connect = resume_newest_on_connect + self.resume_oldest_on_connect = resume_oldest_on_connect + self.resume_all_on_connect = resume_all_on_connect + self.disconnect_on_suspend = disconnect_on_suspend + self.disconnect_on_terminate = disconnect_on_terminate + self.splash_image = splash_image + self.disable_splash = disable_splash + self.disable_options = disable_options + self.disable_printingprefs = disable_printingprefs + self.disable_profilemanager = disable_profilemanager + self.disable_notifications = disable_notifications + self.display = display + self.logon_window_position = logon_window_position + self.published_applications_no_submenus = published_applications_no_submenus + self.lang = lang + self.backend_controlsession = backend_controlsession + self.backend_terminalsession = backend_terminalsession + self.backend_serversessioninfo = backend_serversessioninfo + self.backend_serversessionlist = backend_serversessionlist + self.backend_proxy = backend_proxy + self.backend_sessionprofiles = backend_sessionprofiles + self.backend_clientsettings = backend_clientsettings + self.backend_clientprinting = backend_clientprinting + self.about_image = about_image + +def processArgs(debug, libdebug): + global DEBUG + global print_action_args + + a = args(debug=debug, libdebug=libdebug) + logger = _X2goLogger(tag='CVix') + liblogger = _X2goLogger() + + if a.debug: + logger.set_loglevel_debug() + + if a.libdebug: + liblogger.set_loglevel_debug() + + if a.quiet: + logger.set_loglevel_quiet() + liblogger.set_loglevel_quiet() + + if a.libdebug_sftpxfer: + liblogger.enable_debug_sftpxfer() + + if a.single_session_profile and a.session_profile is None: + m = messages.PyHoca_MessageWindow_Ok(wx.App(), shortmsg='SINGLESESSIONS', msg='The --single-session-profile option requires naming of a specific session profile!', title=u'PyHoca-GUI (%s)...' % VERSION, icon='pyhoca-trayicon') + m.ShowModal() + sys.exit(1) + + if a.non_interactive: + if a.session_profile is None: + m = messages.PyHoca_MessageWindow_Ok(wx.App(), shortmsg='SINGLESESSIONS', msg='In non-interactive mode you have to use the --session-profile option (or -P) to specify a certain session profile name!', title=u'PyHoca-GUI (%s)...' % VERSION, icon='pyhoca-trayicon') + m.ShowModal() + sys.exit(1) + a.restricted_trayicon = True + a.auto_connect = True + a.start_on_connect = True + a.resume_all_on_connect = True + a.exit_on_disconnect = True + a.disconnect_on_suspend = True + a.disconnect_on_terminate = True + a.single_session_profile = True + + if a.non_interactive and (a.resume_newest_on_connect or a.resume_oldest_on_connect): + # allow override... + a.resume_all_on_connect = False + + if _X2GOCLIENT_OS == "Windows": + _x = _X2GoClientXConfig() + _known_xservers = _x.known_xservers + _installed_xservers = _x.installed_xservers + + if _X2GOCLIENT_OS == 'Windows' and a.preferred_xserver: + if a.preferred_xserver not in _installed_xservers: + m = messages.PyHoca_MessageWindow_Ok(wx.App(), shortmsg='SINGLESESSIONS', msg='Xserver ,,%s\'\' is not installed on your Windows system' % a.preferred_xserver, title=u'PyHoca-GUI (%s)...' % VERSION, icon='pyhoca-trayicon') + m.ShowModal() + sys.exit(1) + a.start_xserver = a.preferred_xserver + + if _X2GOCLIENT_OS == 'Windows' and a.start_xserver and a.display: + m = messages.PyHoca_MessageWindow_Ok(wx.App(), shortmsg='SINGLESESSIONS', msg='You can tell PyHoca-GUI to handle XServer startup and then specify a DISPLAY environment variable!', title=u'PyHoca-GUI (%s)...' % VERSION, icon='pyhoca-trayicon') + m.ShowModal() + sys.exit(1) + + if a.display: + os.environ.update({'DISPLAY': a.display}) + else: + if _X2GOCLIENT_OS == 'Windows' and not a.start_xserver: + os.environ.update({'DISPLAY': 'localhost:0'}) + + if a.client_rootdir: + a.backend_sessionprofiles='FILE' + a.backend_clientsettings='FILE' + a.backend_clientprinting='FILE' + + return a, logger, liblogger + +def startCVix(loglevel): + """ + Deze functie zorgt er voor dat bij verschillende mensen die gebruik + maken van dezelfde computer en verschillende accounts hebben, + de directory met de juiste instellingen gekopieerd wordt naar + de nieuwe gebruiker. Tevens geeft het info indien er een probleem met + opstarten. + """ + libdbg = dbg = False + if loglevel in ('--debug', '-D'): + libdbg = dbg = True + + a, logger, liblogger = processArgs(debug=dbg, libdebug=libdbg) + + print 'Programma %s' % ProgramFiles + if ProgramFiles is None: + logger.error('CVix gevonden in register, maar de installatiedirectory niet gevonden') + sys.exit(1) + configFile(ProgramFiles) + + if _X2GOCLIENT_OS == 'Windows': + print 'Locale basepath = ' + locale_basepath + print 'languages = ' + a.lang + if a.lang: + lang = gettext.translation('pyhoca-gui', localedir=locale_basepath, languages=[a.lang], ) + else: + lang = gettext.translation('pyhoca-gui', localedir=locale_basepath, languages=['en'], ) + lang.install(unicode=True) + else: + gettext.install('pyhoca-gui', localedir=locale_basepath, unicode=True) + + if check_running(): + sys.stderr.write("\n###############################\n### %s: already running for user %s\n###############################\n" % (PROG_NAME, _CURRENT_LOCAL_USER)) + m = messages.PyHoca_MessageWindow_Ok(wx.App(), shortmsg='ALREADY_RUNNING', title=u'PyHoca-GUI (%s)...' % VERSION, icon='pyhoca-trayicon') + m.ShowModal() + + try: + thisPyHocaGUI = PyHocaGUI(a, logger, liblogger, version=VERSION, appname='CVix') + thisPyHocaGUI.MainLoop() + except KeyboardInterrupt: + thisPyHocaGUI.WakeUpIdle() + thisPyHocaGUI.ExitMainLoop() + except SystemExit: + thisPyHocaGUI.WakeUpIdle() + thisPyHocaGUI.ExitMainLoop() + +if __name__ == '__main__': +# debug options... + mainPath = os.path.normpath(os.path.dirname(sys.argv[0])) + os.chdir(mainPath) + global DEBUG + global print_action_args + ldb = None + if len(sys.argv) > 1: + ldb = sys.argv[1] + + startCVix(ldb) diff --git a/CVix/CVix_initemplate.py b/CVix/CVix_initemplate.py new file mode 100644 index 0000000..957b883 --- /dev/null +++ b/CVix/CVix_initemplate.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +SESSION_PROFILE_TEMPLATE = { + 'iconvfrom': 'UTF-8', + 'height': 600, + 'speed': 0, + 'setsessiontitle': 0, + 'sessiontitle': '', + 'width': 800, + 'krblogin': False, + 'soundsystem': 'pulse', + 'autostart': True, + 'maxdim': True, + 'type': 'auto', + 'sndport': 4713, + # gets substituted during application start + 'sshproxyuser': '{sshproxyuser}', + 'usekbd': True, + 'autologin': False, + 'sound': False, + 'rootless': True, + # gets substituted during application start + 'sshproxyhost': '{sshproxyhost}', + 'name': 'CVix', + 'iconvto': 'UTF-8', + 'sshport': 3389, + 'startsoundsystem': False, + 'pack': '16m-rgb-%%', + 'defsndport': True, + 'useiconv': False, + 'multidisp': False, + # gets substituted during application start + 'export': "{local_home}:1;", + 'fullscreen': True, + 'useexports': True, + 'quality': 9, + 'xdmcpserver': 'localhost', + 'xinerama': 0, + 'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', + 'print': 1, + 'usesshproxy': 1, + 'sshproxytunnel': 'localhost:53000:localhost:3389', + # gets substituted during application start + 'sshproxykeyfile': '{sshproxykeyfile}', + 'fstunnel': True, + 'applications': 'TERMINAL, WWWBROWSER, MAILCLIENT, OFFICE', + 'host': 'localhost', + 'mimeboxextensions': '', + # gets substituted during application start + 'user': '{user}', + 'key': '', + # gets substituted during application start + 'icon': '{icon}', + 'mimeboxaction': 'OPEN', + 'rdpserver': '', + 'soundtunnel': 1, + 'command': 'startcvix.sh', + 'dpi': 96, + 'published': False, + 'setdpi': False, + 'usemimebox': True, +} diff --git a/CVix/__init__.py b/CVix/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/CVix/icons/16x16/CVix.png b/CVix/icons/16x16/CVix.png new file mode 100644 index 0000000..52491ef Binary files /dev/null and b/CVix/icons/16x16/CVix.png differ diff --git a/CVix/icons/22x22/CVix.png b/CVix/icons/22x22/CVix.png new file mode 100644 index 0000000..01717af Binary files /dev/null and b/CVix/icons/22x22/CVix.png differ diff --git a/CVix/img/CVix.png b/CVix/img/CVix.png new file mode 100644 index 0000000..d27b7d5 Binary files /dev/null and b/CVix/img/CVix.png differ diff --git a/CVix/img/cvix_about.png b/CVix/img/cvix_about.png new file mode 100644 index 0000000..73fb155 Binary files /dev/null and b/CVix/img/cvix_about.png differ diff --git a/CVix/nsis_template_CVix.py b/CVix/nsis_template_CVix.py new file mode 100644 index 0000000..295f0fe --- /dev/null +++ b/CVix/nsis_template_CVix.py @@ -0,0 +1,220 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +NSIS_SCRIPT_TEMPLATE = """ +;{program_name}.nsi +; + +!define VERSION {program_version} + +;-------------------------------- + +; The name of the installer +Name "{program_name}" + +; Sets the title bar text (although NSIS seems to append "Installer") +Caption "{program_desc}" + +!define py2exeOutputDirectory '{output_dir}' + +; The file to write +OutFile "..\\{program_name}_{schema}_${{VERSION}}_win32-setup.exe" + +; The default installation directory +InstallDir $PROGRAMFILES\\{program_name} + +; Registry key to check for directory (so if you install again, it will +; overwrite the old one automatically) +InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" + +; Request application privileges for Windows Vista +RequestExecutionLevel admin + +;-------------------------------- + +; Installer Language Configuration + +!include LogicLib.nsh + +var LC_MESSAGES + +; i18n strings +var REQUIRED +var DESKTOP_LINKS +var STARTMENU_LINKS +var WITHOUT_PULSEAUDIO +var GSPRINT + +; First is default +LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Dutch.nlf" +LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\English.nlf" +;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\French.nlf" +LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\German.nlf" +;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Korean.nlf" +;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Russian.nlf" +LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Spanish.nlf" +;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Swedish.nlf" +;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\TradChinese.nlf" +;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\SimpChinese.nlf" +;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Slovak.nlf" + +; License data +; Not exactly translated, but it shows what's needed +LicenseLangString myLicenseData ${{LANG_DUTCH}} "LICENSE.txt" +LicenseLangString myLicenseData ${{LANG_ENGLISH}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_FRENCH}} "LICENSE.txt" +LicenseLangString myLicenseData ${{LANG_GERMAN}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_KOREAN}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_RUSSIAN}} "LICENSE.txt" +LicenseLangString myLicenseData ${{LANG_SPANISH}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_SWEDISH}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_TRADCHINESE}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_SIMPCHINESE}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_SLOVAK}} "LICENSE.txt" + +LicenseData $(myLicenseData) + +; Set name using the normal interface (Name command) +LangString Name ${{LANG_DUTCH}} "Dutch" +LangString Name ${{LANG_ENGLISH}} "English" +;LangString Name ${{LANG_FRENCH}} "French" +LangString Name ${{LANG_GERMAN}} "German" +;LangString Name ${{LANG_KOREAN}} "Korean" +;LangString Name ${{LANG_RUSSIAN}} "Russian" +LangString Name ${{LANG_SPANISH}} "Spanish" +;LangString Name ${{LANG_SWEDISH}} "Swedish" +;LangString Name ${{LANG_TRADCHINESE}} "Traditional Chinese" +;LangString Name ${{LANG_SIMPCHINESE}} "Simplified Chinese" +;LangString Name ${{LANG_SLOVAK}} "Slovak" + +Function .onInit + + ;Language selection dialog + + Push "" + Push ${{LANG_DUTCH}} + Push Dutch + Push ${{LANG_ENGLISH}} + Push English +; Push ${{LANG_FRENCH}} +; Push French + Push ${{LANG_GERMAN}} + Push German +; Push ${{LANG_KOREAN}} +; Push Korean +; Push ${{LANG_RUSSIAN}} +; Push Russian + Push ${{LANG_SPANISH}} + Push Spanish +; Push ${{LANG_SWEDISH}} +; Push Swedish +; Push ${{LANG_TRADCHINESE}} +; Push "Traditional Chinese" +; Push ${{LANG_SIMPCHINESE}} +; Push "Simplified Chinese" +; Push ${{LANG_SLOVAK}} +; Push Slovak + Push A ; A means auto count languages + ; for the auto count to work the first empty push (Push "") must remain + LangDLL::LangDialog "Installer Language" "Please select the language of the installer" + + Pop $LANGUAGE + + ${{Switch}} $LANGUAGE + ${{Case}} 1031 + StrCpy $LC_MESSAGES "de" + !include "nsis_include\\de.nsi" + ${{Break}} + ${{Case}} 1033 + StrCpy $LC_MESSAGES "en" + !include "nsis_include\\en.nsi" + ${{Break}} + ${{Case}} 1043 + StrCpy $LC_MESSAGES "nl" + !include "nsis_include\\nl.nsi" + ${{Break}} + ${{Case}} 1034 + StrCpy $LC_MESSAGES "es" + !include "nsis_include\\es.nsi" + ${{Break}} + ${{EndSwitch}} + + StrCmp $LANGUAGE "cancel" 0 +2 + Abort + +FunctionEnd + +;-------------------------------- + +; Pages +Page license +Page components +Page directory +Page instfiles + +UninstPage uninstConfirm +UninstPage instfiles + +;-------------------------------- + +; The stuff to install +Section "{program_name} ($REQUIRED)" + + SectionIn RO + ; Set output path to the installation directory. + SetOutPath "$INSTDIR" + File /r /x .svn /x .git "${{py2exeOutputDirectory}}\\*.*" + + ; Write the installation path into the registry + WriteRegStr HKLM SOFTWARE\\{program_name} "Install_Dir" "$INSTDIR" + WriteRegStr HKLM SOFTWARE\\{program_name} "Path" "$INSTDIR" + + + ; Write the uninstall keys for Windows + WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{program_name}" "DisplayName" "{program_name}" + WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{program_name}" "UninstallString" '"$INSTDIR\\uninstall.exe"' + WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{program_name}" "NoModify" 1 + WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{program_name}" "NoRepair" 1 + WriteUninstaller "uninstall.exe" + +SectionEnd + +; Optional section (can be disabled by the user) +Section "$STARTMENU_LINKS" + + CreateDirectory "$SMPROGRAMS\\{program_name}" + CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name}.lnk" "$INSTDIR\\{program_name}.exe" "" "$INSTDIR\\icons\\{program_name}.ico" 0 + CreateShortCut "$SMPROGRAMS\\{program_name}\\Uninstall.lnk" "$INSTDIR\\uninstall.exe" "" "$INSTDIR\\uninstall.exe" 0 + +SectionEnd + +; Optional section (can be disabled by the user) +Section "$DESKTOP_LINKS" + + CreateShortCut "$DESKTOP\\{program_name}.lnk" "$INSTDIR\\{program_name}.exe" "" "$INSTDIR\\icons\\{program_name}.ico" 0 + +SectionEnd + +;-------------------------------- + +; Uninstaller + +Section "Uninstall" + + ; Remove registry keys + DeleteRegKey HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{program_name}" + DeleteRegKey HKLM SOFTWARE\\{program_name} + + ; Remove files and uninstaller + Delete $INSTDIR\\uninstall.exe + + ; Remove shortcuts, if any + Delete "$SMPROGRAMS\\{program_name}\\*.*" + Delete "$DESKTOP\\{program_name}.lnk" + + ; Remove directories used + RMDir "$SMPROGRAMS\\{program_name}" + RMDir /r /REBOOTOK $INSTDIR + +SectionEnd +""" diff --git a/CVix/pixmaps/CVix.ico b/CVix/pixmaps/CVix.ico new file mode 100644 index 0000000..e410de6 Binary files /dev/null and b/CVix/pixmaps/CVix.ico differ diff --git a/setup_CVix.py b/setup_CVix.py new file mode 100755 index 0000000..bec0154 --- /dev/null +++ b/setup_CVix.py @@ -0,0 +1,389 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# +# PyHoca is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PyHoca is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# import the PyHoca-GUI +import sys +import os +import shutil + +### Create Global variables + +mySCHEMA = None +#SCHEMATA = None +CUSTOMER_HOST = None +CUSTOMER_USER = None +CUSTOMER_KEY = None +PROGRAM_DESC = None +PROGRAM_VERSION = '1.2' +PROGRAM_ICON = None +PROGRAM_NAME = 'CVix' +LICENSE = 'AGPLv3+' +AUTHOR = 'Mike Gabriel, Dick Kniep' +URL = 'http://www.lindix.org' +LIBRARY_ZIP = r"lib\shardlib.zip" +PROGRAM_ICON_MAP2 = '' +icon_files = [] +customer_files = [] + +### customize the SCHEMA before running the setup + +def datafilelist(installbase, sourcebase): + datafileList = [] + for root, subFolders, files in os.walk(sourcebase): + fileList = [] + for f in files: + fileList.append(os.path.join(root, f)) + datafileList.append((root.replace(sourcebase, installbase), fileList)) + return datafileList + +def _fillGlobals(schema=None): + global mySCHEMA + global SCHEMATA + global CUSTOMER_HOST + global CUSTOMER_USER + global CUSTOMER_KEY + global PROGRAM_DESC + global PROGRAM_ICON + global PROGRAM_ICON_MAP2 + global icon_files + global customer_files + if len(sys.argv) > 2 and schema is None: + mySCHEMA = sys.argv[2] + del sys.argv[2] + elif schema: + mySCHEMA = schema + else: + mySCHEMA = 'autitude' # not relevant...... + + SCHEMATA = { + 'autitude':'autitude.cvix.nl', + 'cvixcoaches':'cvixcoaches.cvix.nl', + 'comsupport':'communitysupport.cvix.nl', + 'nlwerkt':'nederland-werkt.cvix.nl', + 'amarant':'amarant.cvix.nl', + 'ambulantehulpverlening':'ambulantehulpverlening.cvix.nl', + 'deplannenmakers':'deplannenmakers.cvix.nl', + 'emobrain':'emotionalbrain.cvix.nl', + 'held':'held.cvix.nl', + 'leff':'leff.cvix.nl', + 'menea':'menea.cvix.nl', + 'meneanew':'meneanew.cvix.nl', + 'eega':'eega.cvix.nl', + 'reinaerde':'reinaerde.cvix.nl', + 'ruimbaan':'ruimbaan.cvix.nl', + 'streamcvix':'streamtrajecten.cvix.nl', + 'traject':'trajectbv.cvix.nl', + 'zorgconcept':'zorgconcept.cvix.nl', + 'zzpflevoland':'zzpflevoland.cvix.nl', + 'asscoaching':'asscoaching.cvix.nl', + 'demo':'demo.cvix.nl', + } + + PROGRAM_NAME = 'CVix' + if mySCHEMA in SCHEMATA: + CUSTOMER_HOST = SCHEMATA[mySCHEMA] + else: + CUSTOMER_HOST = mySCHEMA + '.cvix.nl' + CUSTOMER_USER = CUSTOMER_HOST.split('.')[0] + CUSTOMER_KEY = '%s.key' % CUSTOMER_HOST.split('.')[0] + f = open(os.path.join(os.getcwd(), PROGRAM_NAME, 'customer'), 'w+') + f.write(CUSTOMER_HOST) + f.close() + + PROGRAM_DESC = '%s is een terminal server programma aangepast aan het gebruik van CVix door %s' % (PROGRAM_NAME, CUSTOMER_USER) + PROGRAM_ICON = "%s/pixmaps/%s.ico" % (PROGRAM_NAME, PROGRAM_NAME) + PROGRAM_ICON_MAP2 = "%s\\pixmaps\\%s.ico" % (PROGRAM_NAME, PROGRAM_NAME) + icon_files = datafilelist('icons\\PyHoca', r'icons\\PyHoca') + datafilelist('icons\\PyHoca', r'%s\\icons' % PROGRAM_NAME) + customer_files = [(PROGRAM_NAME, [r'%s\\keys\\' % PROGRAM_NAME + CUSTOMER_KEY, r'%s\\customer' % PROGRAM_NAME])] + + +#from setuptools import setup, find_packages +from distutils.core import setup, Command +import platform + +_fillGlobals() +NSIS_COMPILE = os.path.join(os.environ['ProgramFiles'], 'NSIS', 'makensis.exe') +# from py2exe.build_exe import py2exe +from bbfreeze import Freezer +py2exe = object +import os, os.path +import subprocess +sys.path.append(os.path.normpath('../pyhoca-contrib/mswin/ms-vc-runtime')) + +from glob import glob + +exec("from %s.nsis_template_%s import NSIS_SCRIPT_TEMPLATE" % (PROGRAM_NAME, PROGRAM_NAME)) + +# +# to build .exe file, run on Windows: +# ,,python setup.py py2exe'' +# +# to update i18n .mo files (and merge .pot file into .po files) run on Linux: +# ,,python setup.py build_i18n -m'' + +cmd_class = {} +data_files = [] + +class NSISScript(object): + + def __init__(self, program_name, program_desc, program_version, dist_dir, icon_loc): + self.program_name = program_name + self.program_desc = program_desc + self.program_version = program_version + self.dist_dir = dist_dir + self.icon_loc = icon_loc + self.pathname = "setup_%s.nsi" % self.program_name + + def create(self): + contents = NSIS_SCRIPT_TEMPLATE.format( + program_name = self.program_name, + program_version = self.program_version, + program_desc = self.program_desc, + output_dir = self.dist_dir, + icon_location = os.path.join(self.dist_dir, self.icon_loc), + schema = mySCHEMA) + + with open(self.pathname, "w") as outfile: + outfile.write(contents) + + def compile(self): + subproc = subprocess.Popen( + # "/P5" uses realtime priority for the LZMA compression stage. + # This can get annoying though. + [NSIS_COMPILE, self.pathname, "/P5"], env=os.environ) + subproc.communicate() + + retcode = subproc.returncode + + if retcode: + raise RuntimeError("NSIS compilation return code: %d" % retcode) + +class build_all(Command): + user_options = [('all','A','yes')] + def initialize_options(self): + pass + def finalize_options(self): + pass + def run(self): + + logFile = file('build_all.log','ab') + + for schema, machine in SCHEMATA.items(): + print "\n\n\n* * * * * * * * * Build environment %s\n\n" % schema + _fillGlobals(schema) + sys.argv[1] = 'build_installer_bbfreeze' + startSetup() + + +class build_installer(object): + + # This class first invokes building the the exe file(s) and then creates an NSIS + # installer + def __init__(self, dist_dir): + self.dist_dir = dist_dir + + def do_build_exe(self): + # replace this method with the freezer's build_exe logic + pass + + def run(self): + + # clean up dist_dir + shutil.rmtree(self.dist_dir, ignore_errors=True) + # and recreate a clean one afterwards + os.makedirs(self.dist_dir) + + # First, build the exe file + self.do_build_exe() + + # Create the installer, using the files py2exe has created. + script = NSISScript( + PROGRAM_NAME, + PROGRAM_DESC, + PROGRAM_VERSION, + self.dist_dir, + os.path.normpath(PROGRAM_ICON) + ) + print "*** creating the NSIS setup script***" + script.create() + print "*** compiling the NSIS setup script***" + script.compile() + +class build_installer_bbfreeze(build_installer, Freezer, Command): + + user_options = [ + ('dist-dir=', 'd', + "directory to put final built distributions in (default is dist)"), + + ("excludes=", 'e', + "comma-separated list of modules to exclude"), + ("includes=", 'i', + "comma-separated list of modules to include"), + ] + + def __init__(self, *args, **kwargs): + Command.__init__(self, *args) + build_installer.__init__(self, dist_dir=self.dist_dir) + + def initialize_options(self): + self.includes = [] + self.excludes = [] + self.packages = [] + self.compressed = False + self.dist_dir = None + + def finalize_options(self): + self.includes = fancy_split(self.includes) + self.excludes = fancy_split(self.excludes) + self.compressed = False + if self.dist_dir is None: + self.dist_dir = 'dist' + self.dist_dir = os.path.abspath(os.path.join(os.getcwd(), self.dist_dir)) + if not os.path.exists(self.dist_dir): + os.makedirs(self.dist_dir) + + def do_build_exe(self): + Freezer.__init__(self, self.dist_dir, + includes=self.includes, + excludes=self.excludes, + ) + self.addScript("CVix.py", gui_only=True) + Freezer.__call__(self) + if self.distribution.has_data_files(): + print "*** copy data files ***" + install_data = self.reinitialize_command('install_data') + install_data.install_dir = self.dist_dir + install_data.ensure_finalized() + install_data.run() + +def fancy_split(strVal, sep=","): + # a split which also strips whitespace from the items + # passing a list or tuple will return it unchanged + if strVal is None: + return [] + if hasattr(strVal, "split"): + return [item.strip() for item in strVal.split(sep)] + return strVal + + + +executables = [] +if platform.system() == 'Windows': + + dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\pyhoca-contrib\\mswin\\ms-vc-runtime\\*.*'))] + nxproxy_files = [("nxproxy", glob(r'..\\pyhoca-contrib\\mswin\\nxproxy-mswin\\nxproxy-3.5.0.12\\*.*'))] + pulseaudio_files = [("pulseaudio", glob(r'..\\pyhoca-contrib\\mswin\\pulseaudio-mswin\\pulseaudio-1.1\\*.*'))] + xserver_files = datafilelist('vcxsrv', r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.14.2.0') + + icon_files = datafilelist('icons\\PyHoca', r'icons\\PyHoca') + img_files = [("img", glob(r'img\\*.*'))] + i18n_files = datafilelist('mo', r'build\\mo') + + data_files.extend([ ('icons', ["pixmaps\\pyhoca-gui.ico"]), ] + + dll_data_files + + icon_files + + img_files + + nxproxy_files + + pulseaudio_files + + xserver_files + + i18n_files + ) + + cmd_class.update( + { + "build_with_bbfreeze": build_installer_bbfreeze, + } + ) + cmd_class.update({ 'build_exe': cmd_class['build_with_{freezer}'.format(freezer='bbfreeze')] }) + +elif platform.system() == 'Linux': + cmd_class.update( + { + "build" : build_extra.build_extra, + "build_i18n" : build_i18n.build_i18n, + "clean": clean_i18n.clean_i18n, + } + ) + + icon_files = datafilelist('{prefix}/share/icons/PyHoca'.format(prefix=sys.prefix), r'icons/PyHoca') + img_files = [("{prefix}/share/pyhoca/img".format(prefix=sys.prefix), glob('img/*.*'))] + desktop_files = [ + ('{prefix}/share/applications'.format(prefix=sys.prefix), glob('desktop/*')), + ('{prefix}/share/pixmaps'.format(prefix=sys.prefix), glob('pixmaps/*.svg')), + ] + manpage_files = [ + ('{prefix}/share/man/man1'.format(prefix=sys.prefix), glob('man/man1/*.1')), + ] + data_files.extend(icon_files + + img_files + + desktop_files + + manpage_files + ) + +if platform.system() == 'Windows': + cmd_options={ + 'py2exe': { + 'includes': ['greenlet', 'gevent.core', 'gevent.ares', 'gevent._semaphore', 'gevent._util', ], + 'compressed': 1, + 'optimize': 2, + }, + 'build_with_py2exe': { + 'includes': ['greenlet', 'gevent.core', 'gevent.ares', 'gevent._semaphore', 'gevent._util', ], + 'compressed': 1, + 'optimize': 2, + }, + 'build_with_bbfreeze': { + 'includes': ['greenlet', 'gevent.core', 'gevent.ares', 'gevent._semaphore', 'gevent._util', 'gevent.resolver_thread', 'gevent.resolver_ares', 'gevent.server', 'gevent.socket', 'gevent.threadpool', 'gevent.select', 'gevent.subprocess', 'distutils.version', 'Crypto', 'Crypto.Random', 'Crypto.Hash', 'Crypto.PublicKey', 'Crypto.PublicKey.DSA', 'Crypto.PublicKey.RSA', 'Crypto.Cipher', 'Crypto.Cipher.AES', 'Crypto.Cipher.ARC4', 'Crypto.Cipher.Blowfish', 'Crypto.Cipher.DES3', 'Crypt [...] + 'excludes': ['MSVCR90.dll', 'MSVCP90.dll', ], + } + } + cmd_options.update({ 'build_exe': cmd_options['build_with_{freezer}'.format(freezer='bbfreeze')] }) + +else: + cmd_options={} + +def startSetup(): + setup( + name = PROGRAM_NAME, + version = PROGRAM_VERSION, + description = PROGRAM_DESC, + license = LICENSE, + author = AUTHOR, + url = URL, + namespace_packages = [ 'pyhoca', ], + packages = [ 'pyhoca.wxgui', ], + package_dir = {'': '.'}, + install_requires = [ 'setuptools', ], + cmdclass = cmd_class, + windows = [ + { + "script": "pyhoca-gui", + "icon_resources": [(0, os.path.normpath(PROGRAM_ICON))], + "dest_base": PROGRAM_NAME, + }, + ], + data_files=data_files, + zipfile = LIBRARY_ZIP, + executables = executables, + options=cmd_options, + ) + + +startSetup() -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 752afcaaefb8c1ee31563419db00d4b506b6a370 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Feb 5 16:03:32 2014 +0100 CVix: rewrite CVix_setup.py --- CVix.py | 65 ++- CVix_customer.key | 1 + CVix_nsis_template.py | 4 +- ...template.py => CVix_session_profile_template.py | 1 + CVix_setup.py | 415 +++----------------- desktop/CVix.desktop | 12 + icons/CVix/128x128/CVix_sessionicon.png | Bin 0 -> 3091 bytes icons/CVix/128x128/CVix_trayicon.png | Bin 0 -> 3091 bytes icons/CVix/128x128/CVix_winicon.png | Bin 0 -> 3091 bytes icons/CVix/16x16/CVix_sessionicon.png | Bin 0 -> 483 bytes icons/CVix/22x22/CVix_sessionicon.png | Bin 0 -> 654 bytes img/CVix.png | Bin 3956205 -> 0 bytes pixmaps/CVix.svg | 358 +++++++++++++++++ 13 files changed, 493 insertions(+), 363 deletions(-) diff --git a/CVix.py b/CVix.py index 25a76dd..d26ccce 100755 --- a/CVix.py +++ b/CVix.py @@ -25,13 +25,67 @@ import sys from pyhoca.wxgui import * from pyhoca.wxgui import __VERSION__ +import x2go +import CVix_session_profile_template + __author__ = "Mike Gabriel, Dick Kniep" __version__ = 2.0 -if __name__ == '__main__': +PROG_NAME = 'CVix' +# change this to .CVix??? +SESSION_DIR = '.x2goclient' + + +def CVixConfigFile(): + """\ + Create CVix's customer based session profile file. + + """ + f = open(os.path.join('CVix_customer'), 'r') + CUSTOMER_HOST = f.read().replace('\n', '').replace('\r', '') + f.close() + CUSTOMER_USER = CUSTOMER_HOST.split('.')[0] + CUSTOMER_KEY = 'CVix_customer.key' + + session_dir = os.path.join(os.path.normpath(os.path.expanduser('~')), SESSION_DIR) + session_file = os.path.join(session_dir, 'sessions') + + session_profiles = x2go.X2GoSessionProfiles(config_files=[session_file]) + + found = False + if 'CVix' in session_profiles.profile_names: + session_profiles.delete_profile('CVix') + + profile_config = CVix_session_profile_template.SESSION_PROFILE_TEMPLATE + customized_config = { + 'sshproxyhost': '{hostname}'.format(hostname=CUSTOMER_HOST), + 'sshproxyport': 3389, + 'sshproxyuser': CUSTOMER_USER, + 'sshproxykeyfile': os.path.join(CUSTOMER_KEY), + 'icon': os.path.join('icons', 'CVix', '128x128', 'CVix_sessionicon.png'), + 'user': x2go.CURRENT_LOCAL_USER, + } + + profile_config['export'] = profile_config['export'].format(local_home=os.path.normpath(os.path.expanduser('~'))) + profile_config.update(customized_config) + + session_profiles.add_profile(profile_id=None, **profile_config) + session_profiles.write_user_config = True + session_profiles.write() + +def startCVix(): + """\ + Deze functie zorgt er voor dat bij verschillende mensen die gebruik + maken van dezelfde computer en verschillende accounts hebben, + de directory met de juiste instellingen gekopieerd wordt naar + de nieuwe gebruiker. Tevens geeft het info indien er een probleem met + opstarten. + + """ + launcher = PyHocaGUI_Launcher() - launcher.setup_progname('CVix') + launcher.setup_progname(PROG_NAME) launcher.setup_version(__version__) launcher.setup_consolelog() launcher.setup_process() @@ -52,3 +106,10 @@ if __name__ == '__main__': args, logger, liblogger = launcher.parseargs() launcher.main(args=args, logger=logger, liblogger=liblogger) + + +if __name__ == '__main__': + + CVixConfigFile() + startCVix() + diff --git a/CVix_customer.key b/CVix_customer.key new file mode 120000 index 0000000..242d00d --- /dev/null +++ b/CVix_customer.key @@ -0,0 +1 @@ +CVix_restricted/keys/eega.key \ No newline at end of file diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index 295f0fe..e267ecf 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -15,7 +15,7 @@ Name "{program_name}" ; Sets the title bar text (although NSIS seems to append "Installer") Caption "{program_desc}" -!define py2exeOutputDirectory '{output_dir}' +!define distOutputDirectory '{output_dir}' ; The file to write OutFile "..\\{program_name}_{schema}_${{VERSION}}_win32-setup.exe" @@ -163,7 +163,7 @@ Section "{program_name} ($REQUIRED)" SectionIn RO ; Set output path to the installation directory. SetOutPath "$INSTDIR" - File /r /x .svn /x .git "${{py2exeOutputDirectory}}\\*.*" + File /r /x .svn /x .git "${{distDirectory}}\\*.*" ; Write the installation path into the registry WriteRegStr HKLM SOFTWARE\\{program_name} "Install_Dir" "$INSTDIR" diff --git a/CVix_session_template.py b/CVix_session_profile_template.py similarity index 98% rename from CVix_session_template.py rename to CVix_session_profile_template.py index 957b883..b199aab 100644 --- a/CVix_session_template.py +++ b/CVix_session_profile_template.py @@ -38,6 +38,7 @@ SESSION_PROFILE_TEMPLATE = { 'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'print': 1, 'usesshproxy': 1, + 'sshproxyautologin': False, 'sshproxytunnel': 'localhost:53000:localhost:3389', # gets substituted during application start 'sshproxykeyfile': '{sshproxykeyfile}', diff --git a/CVix_setup.py b/CVix_setup.py index 640f712..d01da0c 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -1,389 +1,86 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# -# PyHoca is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# +# CVix is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# PyHoca is distributed in the hope that it will be useful, +# CVix 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. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# import the PyHoca-GUI import sys import os -import shutil - -### Create Global variables -mySCHEMA = None -#SCHEMATA = None -CUSTOMER_HOST = None -CUSTOMER_USER = None -CUSTOMER_KEY = None -PROGRAM_DESC = None -PROGRAM_VERSION = '1.2' -PROGRAM_ICON = None PROGRAM_NAME = 'CVix' +PROGRAM_DESC = '%s Client is a tool to access CVix application servers' % PROGRAM_NAME +for line in file(os.path.join('pyhoca', 'wxgui', '__init__.py')).readlines(): + if (line.startswith('__VERSION__')): + exec(line.strip()) +PROGRAM_VERSION = __VERSION__ +PROGRAM_ICON = "pixmaps/CVix.ico" LICENSE = 'AGPLv3+' AUTHOR = 'Mike Gabriel, Dick Kniep' -URL = 'http://www.lindix.org' +URL = 'http://www.lindix.nl' LIBRARY_ZIP = r"lib\shardlib.zip" -PROGRAM_ICON_MAP2 = '' -icon_files = [] -customer_files = [] - -### customize the SCHEMA before running the setup - -def datafilelist(installbase, sourcebase): - datafileList = [] - for root, subFolders, files in os.walk(sourcebase): - fileList = [] - for f in files: - fileList.append(os.path.join(root, f)) - datafileList.append((root.replace(sourcebase, installbase), fileList)) - return datafileList - -def _fillGlobals(schema=None): - global mySCHEMA - global SCHEMATA - global CUSTOMER_HOST - global CUSTOMER_USER - global CUSTOMER_KEY - global PROGRAM_DESC - global PROGRAM_ICON - global PROGRAM_ICON_MAP2 - global icon_files - global customer_files - if len(sys.argv) > 2 and schema is None: - mySCHEMA = sys.argv[2] - del sys.argv[2] - elif schema: - mySCHEMA = schema - else: - mySCHEMA = 'autitude' # not relevant...... - - SCHEMATA = { - 'autitude':'autitude.cvix.nl', - 'cvixcoaches':'cvixcoaches.cvix.nl', - 'comsupport':'communitysupport.cvix.nl', - 'nlwerkt':'nederland-werkt.cvix.nl', - 'amarant':'amarant.cvix.nl', - 'ambulantehulpverlening':'ambulantehulpverlening.cvix.nl', - 'deplannenmakers':'deplannenmakers.cvix.nl', - 'emobrain':'emotionalbrain.cvix.nl', - 'held':'held.cvix.nl', - 'leff':'leff.cvix.nl', - 'menea':'menea.cvix.nl', - 'meneanew':'meneanew.cvix.nl', - 'eega':'eega.cvix.nl', - 'reinaerde':'reinaerde.cvix.nl', - 'ruimbaan':'ruimbaan.cvix.nl', - 'streamcvix':'streamtrajecten.cvix.nl', - 'traject':'trajectbv.cvix.nl', - 'zorgconcept':'zorgconcept.cvix.nl', - 'zzpflevoland':'zzpflevoland.cvix.nl', - 'asscoaching':'asscoaching.cvix.nl', - 'demo':'demo.cvix.nl', - } - - PROGRAM_NAME = 'CVix' - if mySCHEMA in SCHEMATA: - CUSTOMER_HOST = SCHEMATA[mySCHEMA] - else: - CUSTOMER_HOST = mySCHEMA + '.cvix.nl' - CUSTOMER_USER = CUSTOMER_HOST.split('.')[0] - CUSTOMER_KEY = '%s.key' % CUSTOMER_HOST.split('.')[0] - f = open(os.path.join(os.getcwd(), PROGRAM_NAME, 'customer'), 'w+') - f.write(CUSTOMER_HOST) - f.close() - - PROGRAM_DESC = '%s is een terminal server programma aangepast aan het gebruik van CVix door %s' % (PROGRAM_NAME, CUSTOMER_USER) - PROGRAM_ICON = "%s/pixmaps/%s.ico" % (PROGRAM_NAME, PROGRAM_NAME) - PROGRAM_ICON_MAP2 = "%s\\pixmaps\\%s.ico" % (PROGRAM_NAME, PROGRAM_NAME) - icon_files = datafilelist('icons\\PyHoca', r'icons\\PyHoca') + datafilelist('icons\\PyHoca', r'%s\\icons' % PROGRAM_NAME) - customer_files = [(PROGRAM_NAME, [r'%s\\keys\\' % PROGRAM_NAME + CUSTOMER_KEY, r'%s\\customer' % PROGRAM_NAME])] - -#from setuptools import setup, find_packages +from setuptools import setup, find_packages from distutils.core import setup, Command import platform -_fillGlobals() -NSIS_COMPILE = os.path.join(os.environ['ProgramFiles'], 'NSIS', 'makensis.exe') -# from py2exe.build_exe import py2exe -from bbfreeze import Freezer -py2exe = object -import os, os.path -import subprocess -sys.path.append(os.path.normpath('../pyhoca-contrib/mswin/ms-vc-runtime')) - -from glob import glob - -exec("from nsis_template_%s import NSIS_SCRIPT_TEMPLATE" % (PROGRAM_NAME, PROGRAM_NAME)) - -# -# to build .exe file, run on Windows: -# ,,python setup.py py2exe'' -# -# to update i18n .mo files (and merge .pot file into .po files) run on Linux: -# ,,python setup.py build_i18n -m'' - -cmd_class = {} -data_files = [] - -class NSISScript(object): - - def __init__(self, program_name, program_desc, program_version, dist_dir, icon_loc): - self.program_name = program_name - self.program_desc = program_desc - self.program_version = program_version - self.dist_dir = dist_dir - self.icon_loc = icon_loc - self.pathname = "setup_%s.nsi" % self.program_name - - def create(self): - contents = NSIS_SCRIPT_TEMPLATE.format( - program_name = self.program_name, - program_version = self.program_version, - program_desc = self.program_desc, - output_dir = self.dist_dir, - icon_location = os.path.join(self.dist_dir, self.icon_loc), - schema = mySCHEMA) - - with open(self.pathname, "w") as outfile: - outfile.write(contents) - - def compile(self): - subproc = subprocess.Popen( - # "/P5" uses realtime priority for the LZMA compression stage. - # This can get annoying though. - [NSIS_COMPILE, self.pathname, "/P5"], env=os.environ) - subproc.communicate() - - retcode = subproc.returncode - - if retcode: - raise RuntimeError("NSIS compilation return code: %d" % retcode) - -class build_all(Command): - user_options = [('all','A','yes')] - def initialize_options(self): - pass - def finalize_options(self): - pass - def run(self): - - logFile = file('build_all.log','ab') - - for schema, machine in SCHEMATA.items(): - print "\n\n\n* * * * * * * * * Build environment %s\n\n" % schema - _fillGlobals(schema) - sys.argv[1] = 'build_installer_bbfreeze' - startSetup() - - -class build_installer(object): - - # This class first invokes building the the exe file(s) and then creates an NSIS - # installer - def __init__(self, dist_dir): - self.dist_dir = dist_dir - - def do_build_exe(self): - # replace this method with the freezer's build_exe logic - pass - - def run(self): - - # clean up dist_dir - shutil.rmtree(self.dist_dir, ignore_errors=True) - # and recreate a clean one afterwards - os.makedirs(self.dist_dir) - - # First, build the exe file - self.do_build_exe() +import setup +from CVix_nsis_template import NSIS_SCRIPT_TEMPLATE +# monkey patch setup.py +setup.NSIS_SCRIPT_TEMPLATE = NSIS_SCRIPT_TEMPLATE - # Create the installer, using the files py2exe has created. - script = NSISScript( - PROGRAM_NAME, - PROGRAM_DESC, - PROGRAM_VERSION, - self.dist_dir, - os.path.normpath(PROGRAM_ICON) - ) - print "*** creating the NSIS setup script***" - script.create() - print "*** compiling the NSIS setup script***" - script.compile() -class build_installer_bbfreeze(build_installer, Freezer, Command): - - user_options = [ - ('dist-dir=', 'd', - "directory to put final built distributions in (default is dist)"), - - ("excludes=", 'e', - "comma-separated list of modules to exclude"), - ("includes=", 'i', - "comma-separated list of modules to include"), - ] - - def __init__(self, *args, **kwargs): - Command.__init__(self, *args) - build_installer.__init__(self, dist_dir=self.dist_dir) - - def initialize_options(self): - self.includes = [] - self.excludes = [] - self.packages = [] - self.compressed = False - self.dist_dir = None - - def finalize_options(self): - self.includes = fancy_split(self.includes) - self.excludes = fancy_split(self.excludes) - self.compressed = False - if self.dist_dir is None: - self.dist_dir = 'dist' - self.dist_dir = os.path.abspath(os.path.join(os.getcwd(), self.dist_dir)) - if not os.path.exists(self.dist_dir): - os.makedirs(self.dist_dir) - - def do_build_exe(self): - Freezer.__init__(self, self.dist_dir, - includes=self.includes, - excludes=self.excludes, - ) - self.addScript("CVix.py", gui_only=True) - Freezer.__call__(self) - if self.distribution.has_data_files(): - print "*** copy data files ***" - install_data = self.reinitialize_command('install_data') - install_data.install_dir = self.dist_dir - install_data.ensure_finalized() - install_data.run() - -def fancy_split(strVal, sep=","): - # a split which also strips whitespace from the items - # passing a list or tuple will return it unchanged - if strVal is None: - return [] - if hasattr(strVal, "split"): - return [item.strip() for item in strVal.split(sep)] - return strVal - - - -executables = [] if platform.system() == 'Windows': - - dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\pyhoca-contrib\\mswin\\ms-vc-runtime\\*.*'))] - nxproxy_files = [("nxproxy", glob(r'..\\pyhoca-contrib\\mswin\\nxproxy-mswin\\nxproxy-3.5.0.12\\*.*'))] - pulseaudio_files = [("pulseaudio", glob(r'..\\pyhoca-contrib\\mswin\\pulseaudio-mswin\\pulseaudio-1.1\\*.*'))] - xserver_files = datafilelist('vcxsrv', r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.14.2.0') - - icon_files = datafilelist('icons\\PyHoca', r'icons\\PyHoca') - img_files = [("img", glob(r'img\\*.*'))] - i18n_files = datafilelist('mo', r'build\\mo') - - data_files.extend([ ('icons', ["pixmaps\\pyhoca-gui.ico"]), ] + - dll_data_files + - icon_files + - img_files + - nxproxy_files + - pulseaudio_files + - xserver_files + - i18n_files - ) - - cmd_class.update( - { - "build_with_bbfreeze": build_installer_bbfreeze, - } - ) - cmd_class.update({ 'build_exe': cmd_class['build_with_{freezer}'.format(freezer='bbfreeze')] }) + CVix_icon_files = datafilelist('icons\\CVix', r'icons\\CVix') + CVix_data_files = CVix_icon_files elif platform.system() == 'Linux': - cmd_class.update( - { - "build" : build_extra.build_extra, - "build_i18n" : build_i18n.build_i18n, - "clean": clean_i18n.clean_i18n, - } - ) - - icon_files = datafilelist('{prefix}/share/icons/PyHoca'.format(prefix=sys.prefix), r'icons/PyHoca') - img_files = [("{prefix}/share/pyhoca/img".format(prefix=sys.prefix), glob('img/*.*'))] - desktop_files = [ - ('{prefix}/share/applications'.format(prefix=sys.prefix), glob('desktop/*')), - ('{prefix}/share/pixmaps'.format(prefix=sys.prefix), glob('pixmaps/*.svg')), + CVix_icon_files = datafilelist('{prefix}/share/icons/CVix'.format(prefix=sys.prefix), r'icons/CVix') + CVix_desktop_files = [ + ('{prefix}/share/applications'.format(prefix=sys.prefix), glob('desktop/CVix.desktop')), + ('{prefix}/share/pixmaps'.format(prefix=sys.prefix), glob('pixmaps/CVix.svg')), ] - manpage_files = [ - ('{prefix}/share/man/man1'.format(prefix=sys.prefix), glob('man/man1/*.1')), + CVix_manpage_files = [ + # ('{prefix}/share/man/man1'.format(prefix=sys.prefix), glob('man/man1/*.1')), ] - data_files.extend(icon_files + - img_files + - desktop_files + - manpage_files - ) - -if platform.system() == 'Windows': - cmd_options={ - 'py2exe': { - 'includes': ['greenlet', 'gevent.core', 'gevent.ares', 'gevent._semaphore', 'gevent._util', ], - 'compressed': 1, - 'optimize': 2, - }, - 'build_with_py2exe': { - 'includes': ['greenlet', 'gevent.core', 'gevent.ares', 'gevent._semaphore', 'gevent._util', ], - 'compressed': 1, - 'optimize': 2, + CVix_data_files = CVix_icon_files + CVix_desktop_files + CVix_manpage_files + +setup.data_files.extend([ ('icons', ["pixmaps\\CVix.ico"]), ] + CVix_files) + +setup( + name = PROGRAM_NAME, + version = PROGRAM_VERSION, + description = PROGRAM_DESC, + license = LICENSE, + author = AUTHOR, + url = URL, + namespace_packages = [ 'pyhoca', ], + packages = [ 'pyhoca.wxgui', ], + package_dir = {'': '.'}, + install_requires = [ 'setuptools', ], + cmdclass = setup.cmd_class, + windows = [ + { + "script": "CVix.py", + "icon_resources": [(0, os.path.normpath(PROGRAM_ICON))], + "dest_base": PROGRAM_NAME, }, - 'build_with_bbfreeze': { - 'includes': ['greenlet', 'gevent.core', 'gevent.ares', 'gevent._semaphore', 'gevent._util', 'gevent.resolver_thread', 'gevent.resolver_ares', 'gevent.server', 'gevent.socket', 'gevent.threadpool', 'gevent.select', 'gevent.subprocess', 'distutils.version', 'Crypto', 'Crypto.Random', 'Crypto.Hash', 'Crypto.PublicKey', 'Crypto.PublicKey.DSA', 'Crypto.PublicKey.RSA', 'Crypto.Cipher', 'Crypto.Cipher.AES', 'Crypto.Cipher.ARC4', 'Crypto.Cipher.Blowfish', 'Crypto.Cipher.DES3', 'Crypt [...] - 'excludes': ['MSVCR90.dll', 'MSVCP90.dll', ], - } - } - cmd_options.update({ 'build_exe': cmd_options['build_with_{freezer}'.format(freezer='bbfreeze')] }) - -else: - cmd_options={} - -def startSetup(): - setup( - name = PROGRAM_NAME, - version = PROGRAM_VERSION, - description = PROGRAM_DESC, - license = LICENSE, - author = AUTHOR, - url = URL, - namespace_packages = [ 'pyhoca', ], - packages = [ 'pyhoca.wxgui', ], - package_dir = {'': '.'}, - install_requires = [ 'setuptools', ], - cmdclass = cmd_class, - windows = [ - { - "script": "pyhoca-gui", - "icon_resources": [(0, os.path.normpath(PROGRAM_ICON))], - "dest_base": PROGRAM_NAME, - }, - ], - data_files=data_files, - zipfile = LIBRARY_ZIP, - executables = executables, - options=cmd_options, - ) - - -startSetup() + ], + data_files=data_files, + zipfile = LIBRARY_ZIP, + executables = executables, + options=setup.cmd_options, +) diff --git a/desktop/CVix.desktop b/desktop/CVix.desktop new file mode 100644 index 0000000..16172d5 --- /dev/null +++ b/desktop/CVix.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=CVix Client +GenericName=CVix Client +Comment=Client for accessing CVix Servers +Exec=CVix +Icon=CVix +X-Window-Icon=CVix +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable +Terminal=false +Type=Application +Categories=GNOME;KDE;Network; diff --git a/icons/CVix/128x128/CVix_sessionicon.png b/icons/CVix/128x128/CVix_sessionicon.png new file mode 100644 index 0000000..9b637cd Binary files /dev/null and b/icons/CVix/128x128/CVix_sessionicon.png differ diff --git a/icons/CVix/128x128/CVix_trayicon.png b/icons/CVix/128x128/CVix_trayicon.png new file mode 100644 index 0000000..9b637cd Binary files /dev/null and b/icons/CVix/128x128/CVix_trayicon.png differ diff --git a/icons/CVix/128x128/CVix_winicon.png b/icons/CVix/128x128/CVix_winicon.png new file mode 100644 index 0000000..9b637cd Binary files /dev/null and b/icons/CVix/128x128/CVix_winicon.png differ diff --git a/icons/CVix/16x16/CVix_sessionicon.png b/icons/CVix/16x16/CVix_sessionicon.png new file mode 100644 index 0000000..3986624 Binary files /dev/null and b/icons/CVix/16x16/CVix_sessionicon.png differ diff --git a/icons/CVix/22x22/CVix_sessionicon.png b/icons/CVix/22x22/CVix_sessionicon.png new file mode 100644 index 0000000..9440f6a Binary files /dev/null and b/icons/CVix/22x22/CVix_sessionicon.png differ diff --git a/img/CVix.png b/img/CVix.png deleted file mode 100644 index d27b7d5..0000000 Binary files a/img/CVix.png and /dev/null differ diff --git a/pixmaps/CVix.svg b/pixmaps/CVix.svg new file mode 100644 index 0000000..04c15f4 --- /dev/null +++ b/pixmaps/CVix.svg @@ -0,0 +1,358 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.46" + width="128" + height="128" + sodipodi:docname="x2go-logo-ubuntu.svg" + sodipodi:docbase="/Users/h1/Documents/Projekte/x2go/x2go" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0" + inkscape:export-filename="/home/h1/Desktop/x2go-logo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata87"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs85"> + <linearGradient + id="linearGradient3453"> + <stop + style="stop-color:#2b0000;stop-opacity:1;" + offset="0" + id="stop3455" /> + <stop + id="stop3461" + offset="0.5" + style="stop-color:#950000;stop-opacity:1;" /> + <stop + style="stop-color:#ffe400;stop-opacity:1;" + offset="1" + id="stop3457" /> + </linearGradient> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 300 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="800 : 300 : 1" + inkscape:persp3d-origin="400 : 200 : 1" + id="perspective2637" /> + <linearGradient + id="linearGradient4665"> + <stop + style="stop-color:#162d50;stop-opacity:1;" + offset="0" + id="stop4667" /> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="1" + id="stop4669" /> + </linearGradient> + <filter + inkscape:collect="always" + x="-0.20268817" + width="1.4053763" + y="-0.4560484" + height="1.9120969" + id="filter3580"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="15.201613" + id="feGaussianBlur3582" /> + </filter> + <filter + inkscape:collect="always" + id="filter4659"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.82806857" + id="feGaussianBlur4661" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4665" + id="linearGradient4671" + x1="400" + y1="100" + x2="400" + y2="0" + gradientUnits="userSpaceOnUse" + gradientTransform="scale(1,1.1)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3453" + id="linearGradient3459" + x1="0" + y1="3" + x2="0" + y2="128" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + inkscape:window-height="816" + inkscape:window-width="1503" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10000" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + showgrid="true" + inkscape:object-nodes="true" + inkscape:grid-points="true" + inkscape:guide-points="true" + width="800px" + height="600px" + inkscape:zoom="4.625" + inkscape:cx="37.664865" + inkscape:cy="66.782471" + inkscape:window-x="0" + inkscape:window-y="22" + inkscape:current-layer="svg2" + units="mm" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + orientation="vertical" + position="100" + id="guide2393" /> + <sodipodi:guide + orientation="vertical" + position="700" + id="guide2395" /> + <inkscape:grid + id="GridFromPre046Settings" + type="xygrid" + originx="0px" + originy="0px" + spacingx="1px" + spacingy="1px" + color="#0000ff" + empcolor="#0000ff" + opacity="0.2" + empopacity="0.4" + empspacing="5" + visible="true" + enabled="true" + dotted="true" /> + </sodipodi:namedview> + <rect + style="fill:url(#linearGradient3459);fill-opacity:1;opacity:0.5" + id="rect2681" + width="128" + height="128" + x="0" + y="-7.1054274e-15" + ry="10.162162" /> + <path + sodipodi:type="arc" + style="opacity:0.11693546;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter3580)" + id="path2397" + sodipodi:cx="410" + sodipodi:cy="150" + sodipodi:rx="90" + sodipodi:ry="40" + d="M 500,150 A 90,40 0 1 1 320,150 A 90,40 0 1 1 500,150 z" + transform="matrix(0.888889,0,0,0.75,-224.4445,38.25)" /> + <g + style="fill:#ffffff" + id="g4" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 90,977.626 L 103.32,951.85 C 104.256,949.33 104.688,947.53 104.688,946.594 C 104.688,945.082 104.184,943.93 103.248,943.282 C 102.24,942.562 100.512,942.202 98.064,942.202 L 98.064,939.826 L 120.168,939.826 L 120.168,942.202 C 117.144,942.202 114.984,942.85 113.472,944.146 C 111.96,945.442 109.872,948.898 106.992,954.514 L 92.376,982.954 L 110.808,1024.498 C 112.68,1028.386 114.336,1031.122 115.776,1032.634 C 117.216,1034.074 118.944,1034.866 120.888,1034.866 L 120.888,1037.1 [...] + id="path6" /> + </g> + <g + style="fill:#ffffff" + id="g8" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,940.474 L 50.976,939.25 L 50.976,941.698 L 6.984,940.474 z" + id="path10" /> + </g> + <g + style="fill:#ffffff" + id="g12" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,946.45 L 50.976,945.298 L 50.976,946.954 L 56.16,947.026 L 56.52,947.026 L 56.808,947.026 L 57.096,947.098 L 57.384,947.098 L 57.672,947.17 L 57.888,947.242 L 58.104,947.314 L 58.32,947.386 L 58.464,947.458 L 58.608,947.53 L 58.752,947.602 L 58.896,947.674 L 58.968,947.746 L 59.112,947.818 L 59.112,947.89 L 59.184,947.89 L 6.984,946.45 z" + id="path14" /> + </g> + <g + style="fill:#ffffff" + id="g16" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,952.498 L 61.272,950.986 L 61.488,951.346 L 61.776,951.922 L 62.064,952.498 L 62.352,953.146 L 62.64,953.794 L 62.784,954.01 L 6.984,952.498 z" + id="path18" /> + </g> + <g + style="fill:#ffffff" + id="g20" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,958.474 L 63.936,956.89 L 65.376,960.058 L 6.984,958.474 z" + id="path22" /> + </g> + <g + style="fill:#ffffff" + id="g24" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,964.45 L 66.528,962.866 L 67.968,966.106 L 6.984,964.45 z" + id="path26" /> + </g> + <g + style="fill:#ffffff" + id="g28" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,970.498 L 69.12,968.77 L 70.632,972.226 L 6.984,970.498 z" + id="path30" /> + </g> + <g + style="fill:#ffffff" + id="g32" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,976.474 L 71.712,974.674 L 73.296,978.274 L 6.984,976.474 z" + id="path34" /> + </g> + <g + style="fill:#ffffff" + id="g36" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,982.45 L 74.304,980.65 L 75.96,984.322 L 6.984,982.45 z" + id="path38" /> + </g> + <g + style="fill:#ffffff" + id="g40" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,988.426 L 76.896,986.554 L 78.408,989.866 L 78.192,990.37 L 6.984,988.426 z" + id="path42" /> + </g> + <g + style="fill:#ffffff" + id="g44" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,994.402 L 77.112,992.458 L 75.168,996.274 L 6.984,994.402 z" + id="path46" /> + </g> + <g + style="fill:#ffffff" + id="g48" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,1000.378 L 74.016,998.578 L 72.216,1002.178 L 6.984,1000.378 z" + id="path50" /> + </g> + <g + style="fill:#ffffff" + id="g52" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,1006.354 L 70.92,1004.626 L 69.192,1008.082 L 6.984,1006.354 z" + id="path54" /> + </g> + <g + style="fill:#ffffff" + id="g56" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,1012.402 L 67.896,1010.746 L 66.168,1013.986 L 6.984,1012.402 z" + id="path58" /> + </g> + <g + style="fill:#ffffff" + id="g60" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,1036.378 L 50.976,1035.154 L 50.976,1037.602 L 6.984,1036.378 z" + id="path62" /> + </g> + <g + style="fill:#ffffff" + id="g64" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,1030.402 L 58.104,1028.962 L 58.032,1029.106 L 57.888,1029.178 L 57.744,1029.322 L 57.6,1029.394 L 57.528,1029.538 L 57.384,1029.61 L 57.312,1029.682 L 57.168,1029.682 L 57.024,1029.754 L 56.952,1029.826 L 56.808,1029.898 L 56.736,1029.898 L 56.592,1029.97 L 56.448,1029.97 L 56.376,1029.97 L 56.232,1030.042 L 56.088,1030.042 L 55.944,1030.042 L 50.976,1030.114 L 50.976,1031.554 L 6.984,1030.402 z" + id="path66" /> + </g> + <g + style="fill:#ffffff" + id="g68" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,1024.354 L 61.776,1022.914 L 60.984,1024.498 L 60.696,1025.002 L 60.48,1025.506 L 60.264,1025.866 L 6.984,1024.354 z" + id="path70" /> + </g> + <g + style="fill:#ffffff" + id="g72" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 6.984,1018.378 L 64.8,1016.794 L 63.288,1019.89 L 6.984,1018.378 z" + id="path74" /> + </g> + <g + style="fill:#ffffff" + id="g76" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 63.936,924.49 L 118.872,924.49 C 123.84,924.49 127.872,928.522 127.872,933.49 L 127.872,1043.362 C 127.872,1048.33 123.84,1052.362 118.872,1052.362 L 63.936,1052.362 L 63.936,1050.418 L 117.864,1050.418 C 122.256,1050.418 125.856,1046.818 125.856,1042.426 L 125.856,934.498 C 125.856,930.106 122.256,926.506 117.864,926.506 L 63.936,926.506 L 63.936,924.49 z" + id="path78" /> + </g> + <g + style="fill:#ffffff" + id="g80" + transform="matrix(1.001001,0,0,1.001001,0,-925.41541)"> + <path + style="fill:#ffffff" + d="M 9,924.49 L 63.936,924.49 L 63.936,926.506 L 9.936,926.506 C 5.544,926.506 1.944,930.106 1.944,934.498 L 1.944,1042.426 C 1.944,1046.818 5.544,1050.418 9.936,1050.418 L 63.936,1050.418 L 63.936,1052.362 L 9,1052.362 C 4.032,1052.362 0,1048.33 0,1043.362 L 0,933.49 C 0,928.522 4.032,924.49 9,924.49 z" + id="path82" /> + </g> +</svg> -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit f04b5a3dbd1dbc3262a75ae9bd06c5960675b579 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 6 00:17:34 2014 +0100 CVix: fix for commit 4aff437 --- CVix_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CVix_setup.py b/CVix_setup.py index 1e8f3c9..78f49e2 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -64,7 +64,7 @@ elif platform.system() == 'Linux': pyhoca_setup.data_files.extend([ ('icons', ["pixmaps\\CVix.ico"]), ] + CVix_data_files) -if __name__ == "main": +if __name__ == "__main__": setup( name = PROGRAM_NAME, version = PROGRAM_VERSION, -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 8b98324bdff113b4cdd725789649fe6526d4b4f0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Feb 5 23:22:22 2014 +0100 CVix: fix usage of datafilelist from the setup module --- CVix_setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CVix_setup.py b/CVix_setup.py index d01da0c..155a270 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -44,11 +44,11 @@ setup.NSIS_SCRIPT_TEMPLATE = NSIS_SCRIPT_TEMPLATE if platform.system() == 'Windows': - CVix_icon_files = datafilelist('icons\\CVix', r'icons\\CVix') + CVix_icon_files = setup.datafilelist('icons\\CVix', r'icons\\CVix') CVix_data_files = CVix_icon_files elif platform.system() == 'Linux': - CVix_icon_files = datafilelist('{prefix}/share/icons/CVix'.format(prefix=sys.prefix), r'icons/CVix') + CVix_icon_files = setup.datafilelist('{prefix}/share/icons/CVix'.format(prefix=sys.prefix), r'icons/CVix') CVix_desktop_files = [ ('{prefix}/share/applications'.format(prefix=sys.prefix), glob('desktop/CVix.desktop')), ('{prefix}/share/pixmaps'.format(prefix=sys.prefix), glob('pixmaps/CVix.svg')), -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 4105d838e708de89cec31db56f86245db33cfd3d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 6 00:22:37 2014 +0100 CVix: remove faulty string placeholder from CVix_nsis_template.py --- CVix_nsis_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index 78d432a..7b8fd15 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -18,7 +18,7 @@ Caption "{program_desc}" !define distOutputDirectory '{output_dir}' ; The file to write -OutFile "..\\{program_name}_{schema}_${{VERSION}}_win32-setup.exe" +OutFile "..\\{program_name}_${{VERSION}}_win32-setup.exe" ; The default installation directory InstallDir $PROGRAMFILES\\{program_name} -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 404dc79d975de8260afe504cde16035adbb3f4f2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Feb 5 23:24:49 2014 +0100 CVix: fix faulty variable name --- CVix_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CVix_setup.py b/CVix_setup.py index 155a270..1c72152 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -58,7 +58,7 @@ elif platform.system() == 'Linux': ] CVix_data_files = CVix_icon_files + CVix_desktop_files + CVix_manpage_files -setup.data_files.extend([ ('icons', ["pixmaps\\CVix.ico"]), ] + CVix_files) +setup.data_files.extend([ ('icons', ["pixmaps\\CVix.ico"]), ] + CVix_data_files) setup( name = PROGRAM_NAME, -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 93c085497a316c8794e63294a8930c12844f1aa6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 6 01:16:23 2014 +0100 CVix: call setup_consolelog() as early as possible --- CVix.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CVix.py b/CVix.py index a7aeaef..f5b95ca 100755 --- a/CVix.py +++ b/CVix.py @@ -22,7 +22,10 @@ import os import sys -from pyhoca.wxgui import * +from pyhoca.wxgui.launcher import setup_consolelog +setup_consolelog() + +from pyhoca.wxgui.launcher import * import x2go import CVix_session_profile_template @@ -30,11 +33,11 @@ import CVix_session_profile_template __AUTHOR__ = "Mike Gabriel, Dick Kniep" __VERSION__ = "1.99.1" + PROG_NAME = 'CVix' # change this to .CVix??? SESSION_DIR = '.x2goclient' - def CVixConfigFile(): """\ Create CVix's customer based session profile file. @@ -86,7 +89,6 @@ def startCVix(): launcher.setup_progname(PROG_NAME) launcher.setup_version(__VERSION__) - launcher.setup_consolelog() launcher.setup_process() launcher.setup_devmode() -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 4aff437c67cfa291d0f11b7169b010245f7a805b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 6 00:14:23 2014 +0100 CVix: only call setup() function on direct calls --- CVix_setup.py | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/CVix_setup.py b/CVix_setup.py index c7e9fb5..1e8f3c9 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -63,27 +63,29 @@ elif platform.system() == 'Linux': pyhoca_setup.data_files.extend([ ('icons', ["pixmaps\\CVix.ico"]), ] + CVix_data_files) -setup( - name = PROGRAM_NAME, - version = PROGRAM_VERSION, - description = PROGRAM_DESC, - license = LICENSE, - author = AUTHOR, - url = URL, - namespace_packages = [ 'pyhoca', ], - packages = [ 'pyhoca.wxgui', ], - package_dir = {'': '.'}, - install_requires = [ 'setuptools', ], - cmdclass = pyhoca_setup.cmd_class, - windows = [ - { - "script": SCRIPT_NAME, - "icon_resources": [(0, os.path.normpath(PROGRAM_ICON))], - "dest_base": PROGRAM_NAME, - }, - ], - data_files = pyhoca_setup.data_files, - zipfile = LIBRARY_ZIP, - executables = pyhoca_setup.executables, - options = pyhoca_setup.cmd_options, -) + +if __name__ == "main": + setup( + name = PROGRAM_NAME, + version = PROGRAM_VERSION, + description = PROGRAM_DESC, + license = LICENSE, + author = AUTHOR, + url = URL, + namespace_packages = [ 'pyhoca', ], + packages = [ 'pyhoca.wxgui', ], + package_dir = {'': '.'}, + install_requires = [ 'setuptools', ], + cmdclass = pyhoca_setup.cmd_class, + windows = [ + { + "script": SCRIPT_NAME, + "icon_resources": [(0, os.path.normpath(PROGRAM_ICON))], + "dest_base": PROGRAM_NAME, + }, + ], + data_files = pyhoca_setup.data_files, + zipfile = LIBRARY_ZIP, + executables = pyhoca_setup.executables, + options = pyhoca_setup.cmd_options, + ) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 1cc877c6170f1e7bd7d17c34be6096d36dad439a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 11:56:57 2014 +0100 CVix NSIS script: empty installation destination before installing new files into $INSTDIR. --- CVix_nsis_template.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index 97451aa..c272b69 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -244,6 +244,9 @@ Section "{program_name} ($REQUIRED)" SectionIn RO ; Set output path to the installation directory. SetOutPath "$INSTDIR" + ; Empty $INSTDIR before writing new files to it. + RmDir /r "$INSTDIR\\*.*" + ; Install new files... File /r /x .svn /x .git "${{distOutputDirectory}}\\*.*" ; Copy CVix_customer and CVix_customer.key into $INSTDIR -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 4e860347cd4c0207a51514aa84195be0001a3166 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 6 00:36:55 2014 +0100 CVix: detect CVix version correctly. Reduce version slightly below 2.0 --- CVix.py | 2 +- CVix_setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CVix.py b/CVix.py index d26ccce..74d2d4f 100755 --- a/CVix.py +++ b/CVix.py @@ -29,7 +29,7 @@ import x2go import CVix_session_profile_template __author__ = "Mike Gabriel, Dick Kniep" -__version__ = 2.0 +__version__ = 1.99.1 PROG_NAME = 'CVix' # change this to .CVix??? diff --git a/CVix_setup.py b/CVix_setup.py index 0906a03..23683d3 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -24,7 +24,7 @@ import os PROGRAM_NAME = 'CVix' SCRIPT_NAME = 'CVix.py' PROGRAM_DESC = '%s Client is a tool to access CVix application servers' % PROGRAM_NAME -for line in file(os.path.join('pyhoca', 'wxgui', '__init__.py')).readlines(): +for line in file(SCRIPT_NAME).readlines(): if (line.startswith('__VERSION__')): exec(line.strip()) PROGRAM_VERSION = __VERSION__ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 95b91b733de7e7a2089dd2793e6988ab73ca8a07 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 14:33:30 2014 +0100 CVix: drop obsolete file --- CVix_customer.key | 1 - 1 file changed, 1 deletion(-) diff --git a/CVix_customer.key b/CVix_customer.key deleted file mode 120000 index 242d00d..0000000 --- a/CVix_customer.key +++ /dev/null @@ -1 +0,0 @@ -CVix_restricted/keys/eega.key \ No newline at end of file -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit dc2bb699c51732e62e906c0055d479b9a3d6f860 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Feb 5 23:28:58 2014 +0100 CVix: use setup.data_files in setup call --- CVix_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CVix_setup.py b/CVix_setup.py index 1c72152..54f8f82 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -79,7 +79,7 @@ setup( "dest_base": PROGRAM_NAME, }, ], - data_files=data_files, + data_files=setup.data_files, zipfile = LIBRARY_ZIP, executables = executables, options=setup.cmd_options, -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 3ca1818380c0ca73429c7a578b603ba34140493c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 9 10:52:08 2014 +0100 Fix referencing backends X2GoServerSessionInfo and X2GoServerSessionList. --- debian/changelog | 3 ++- pyhoca-gui | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b5dc5e2..2d7db4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,8 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low pyhoca-gui (0.4.0.10-0x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream release (0.4.0.10): + - Fix referencing backends X2GoServerSessionInfo and X2GoServerSessionList. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/pyhoca-gui b/pyhoca-gui index 6cba20a..2082daf 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -35,7 +35,6 @@ from pyhoca.wxgui.launcher import PyHocaGUI_Launcher __author__ = "Mike Gabriel, Dick Kniep" __version__ = __VERSION__ - if __name__ == '__main__': app = PyHocaGUI_Launcher() app.setup_process() -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 2ba7cb178926b2d7a7461f56a8c7d6d42d250173 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 6 00:38:55 2014 +0100 CVix: fix __VERSION__ setup --- CVix.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CVix.py b/CVix.py index 74d2d4f..cc24efd 100755 --- a/CVix.py +++ b/CVix.py @@ -23,13 +23,12 @@ import os import sys from pyhoca.wxgui import * -from pyhoca.wxgui import __VERSION__ import x2go import CVix_session_profile_template -__author__ = "Mike Gabriel, Dick Kniep" -__version__ = 1.99.1 +__AUTHOR__ = "Mike Gabriel, Dick Kniep" +__VERSION__ = 1.99.1 PROG_NAME = 'CVix' # change this to .CVix??? @@ -86,7 +85,7 @@ def startCVix(): launcher = PyHocaGUI_Launcher() launcher.setup_progname(PROG_NAME) - launcher.setup_version(__version__) + launcher.setup_version(__VERSION__) launcher.setup_consolelog() launcher.setup_process() launcher.setup_devmode() -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 286fb72a9a80b58da6aae0343ecca9cf2982f324 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Feb 5 23:57:24 2014 +0100 CVix: fix indentation in CVix_setup.py --- CVix_setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CVix_setup.py b/CVix_setup.py index 34306b6..f05c64f 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -57,8 +57,7 @@ elif platform.system() == 'Linux': CVix_manpage_files = [ # ('{prefix}/share/man/man1'.format(prefix=sys.prefix), glob('man/man1/*.1')), ] - CVix_data_files = CVix_icon_files + CVix_desktop_files + CVix_manpage_files - +CVix_data_files = CVix_icon_files + CVix_desktop_files + CVix_manpage_files pyhoca_setup.data_files.extend([ ('icons', ["pixmaps\\CVix.ico"]), ] + CVix_data_files) setup( -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 39d66f1b910d72263797c2133673a56600b396ef Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 20 22:44:44 2014 +0100 CVix: NSIS tweaking --- CVix_nsis_template.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index 3e64f0c..1c6df7e 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -170,6 +170,14 @@ var WITHOUT_PULSEAUDIO Function .onInit + var GSCRIPT_VERSION + var GSCRIPT_INSTALLER + StrCpy $GSCRIPT_VERSION "9.10" + StrCpy $GSCRIPT_INSTALLER "gs910w32.exe" + + var GSVIEW_VERSION + StrCpy $GSVIEW_VERSION "5.0" + ; ;Language selection dialog ; Push "" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 19432fec0f2f6f207dd18cdb37ce760830f212f5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 20 22:59:21 2014 +0100 CVix: more NSIS tweaking --- CVix_nsis_template.py | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index 1c6df7e..ce078ec 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -24,14 +24,6 @@ NSIS_SCRIPT_TEMPLATE = """ !define VERSION {program_version} -var GSCRIPT_VERSION -var GSVIEW_VERSION -var GSCRIPT_INSTALLER - -StrCpy $GSCRIPT_VERSION "9.10" -StrCpy $GSVIEW_VERSION "5.0" -StrCpy $GSCRIPT_INSTALLER "gs910w32.exe" - ;-------------------------------- ; The name of the installer @@ -170,14 +162,6 @@ var WITHOUT_PULSEAUDIO Function .onInit - var GSCRIPT_VERSION - var GSCRIPT_INSTALLER - StrCpy $GSCRIPT_VERSION "9.10" - StrCpy $GSCRIPT_INSTALLER "gs910w32.exe" - - var GSVIEW_VERSION - StrCpy $GSVIEW_VERSION "5.0" - ; ;Language selection dialog ; Push "" @@ -280,14 +264,14 @@ Section "{program_name} ($REQUIRED)" SectionEnd -Section "Ghostscript ($GSCRIPT_VERSION)" +Section "Ghostscript (9.10)" - File "ghostscript\\$GSCRIPT_INSTALLER" - ExecWait "ghostscript\\$GSCRIPT_INSTALLER /S" + File "ghostscript\\gs910w32.exe" + ExecWait "ghostscript\\gs910w32.exe /S" SectionEnd -Section "GSView ($GSVIEW_VERSION)" +Section "GSView (5.0)" File "gsview\\setup.exe" ExecWait "gsview\\setup.exe" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 90c832e961f351d42df3851c5596e9c11882c20d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 20 22:35:55 2014 +0100 CVix: start on the inclusion of gsprint.exe in the installer --- CVix_nsis_template.py | 25 +++++++++++++++++++++++-- CVix_setup.py | 5 ++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index 7503968..0fd256d 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -24,6 +24,14 @@ NSIS_SCRIPT_TEMPLATE = """ !define VERSION {program_version} +var GSCRIPT_VERSION +var GSVIEW_VERSION +var GSCRIPT_INSTALLER + +StrgCopy $GSCRIPT_VERSION "9.10" +StrgCopy $GSVIEW_VERSION "5.0" +StrgCopy $GSCRIPT_INSTALLER "gs910w32.exe" + ;-------------------------------- ; The name of the installer @@ -159,7 +167,6 @@ var REQUIRED var DESKTOP_LINKS var STARTMENU_LINKS var WITHOUT_PULSEAUDIO -var GSPRINT Function .onInit @@ -247,7 +254,7 @@ Section "{program_name} ($REQUIRED)" ; Empty $INSTDIR before writing new files to it. RmDir /r "$INSTDIR\\*.*" ; Install new files... - File /r /x .svn /x .git "${{distOutputDirectory}}\\*.*" + File /r /x .svn /x .git /x ghostscript /x gsview "${{distOutputDirectory}}\\*.*" ; Copy CVix_customer and CVix_customer.key into $INSTDIR CopyFiles "$EXEDIR\\CVix_customer" "$INSTDIR" @@ -265,6 +272,20 @@ Section "{program_name} ($REQUIRED)" SectionEnd +Section "Ghostscript ($GSCRIPT_VERSION)" + + File "ghostscript\\$GSCRIPT_INSTALLER" + ExecWait "ghostscript\\$GSCRIPT_INSTALLER /S" + +SectionEnd + +Section "GSView ($GSVIEW_VERSION)" + + File "gsview\\setup.exe" + ExecWait "gsview\\setup.exe" + +SectionEnd + ; Optional section (can be disabled by the user) Section "$STARTMENU_LINKS" diff --git a/CVix_setup.py b/CVix_setup.py index 23683d3..9c42124 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -20,6 +20,7 @@ import sys import os +from glob import glob PROGRAM_NAME = 'CVix' SCRIPT_NAME = 'CVix.py' @@ -52,7 +53,9 @@ pyhoca_setup.PROGRAM_VERSION = PROGRAM_VERSION if platform.system() == 'Windows': CVix_icon_files = pyhoca_setup.datafilelist('icons\\CVix', r'icons\\CVix') - CVix_data_files = CVix_icon_files + CVix_gscript_files = [("ghostscript", ['..\\pyhoca-contrib\\mswin\\ghostscript-mswin\\gs910w32.exe'])] + CVix_gsview_files = [("ghostview", glob(r'..\\pyhoca-contrib\\mswin\\ghostview-mswin\\gsview-5.0-win32\\*.*'))] + CVix_data_files = CVix_icon_files + CVix_gscript_files + CVix_gsview_files elif platform.system() == 'Linux': CVix_icon_files = pyhoca_setup.datafilelist('{prefix}/share/icons/CVix'.format(prefix=sys.prefix), r'icons/CVix') -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 65c73b6d1251c6e3a18b862ce3ec8d41312fd0be Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 20:14:24 2014 +0100 CVix: only import PyHocaGUI_Launcher in CVix.py --- CVix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CVix.py b/CVix.py index 6e35f78..fbe2f43 100755 --- a/CVix.py +++ b/CVix.py @@ -29,7 +29,7 @@ except ImportError: import os import sys -from pyhoca.wxgui.launcher import * +from pyhoca.wxgui.launcher import PyHocaGUI_Launcher import x2go import CVix_session_profile_template -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 347d07adffc6b7708ed03e7efbbea79fcdd8f0fb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 10 16:35:26 2014 +0100 CVix: disable splash by default --- CVix.py | 1 + 1 file changed, 1 insertion(+) diff --git a/CVix.py b/CVix.py index eeea464..65229d4 100755 --- a/CVix.py +++ b/CVix.py @@ -112,6 +112,7 @@ def startCVix(): launcher.setup_devmode() launcher.modify_default_option('session_profile', 'CVix') + launcher.modify_default_option('disable_splash', True) launcher.modify_default_option('debug', True) launcher.modify_default_option('libdebug', True) launcher.modify_default_option('remember_username', True) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit d650ca3d09f6a040ee8bdba4056b2f7694810e16 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 20 23:08:43 2014 +0100 CVix: fix packaging of gsprint related files --- CVix_nsis_template.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index d6f80b3..b6ae37a 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -267,7 +267,8 @@ SectionEnd Section "$GSPRINT" - File "ghostscript\\gs910w32.exe" + File "${{distOutputDirectory}}\\ghostscript\\gs910w32.exe" + File /r "${{distOutputDirectory}}\\gsview\\*.*" ExecWait "ghostscript\\gs910w32.exe /S" File "gsview\\setup.exe" ExecWait "gsview\\setup.exe" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 775d2fb5b14d84689183ae3a056e57744698e00d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 22:53:43 2014 +0100 CVix: import mswin_logging from correct namespace --- CVix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CVix.py b/CVix.py index fbe2f43..9f3e3e9 100755 --- a/CVix.py +++ b/CVix.py @@ -21,7 +21,7 @@ PROG_NAME = 'CVix' try: - from pyhoca.mswin.mswin_logging import setup_mswinlog + from pyhoca.wxgui.mswin_logging import setup_mswinlog setup_mswinlog(PROG_NAME) except ImportError: pass -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit b557526bbcf23558a391e5b440bade349ed56870 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 10 16:33:38 2014 +0100 CVix: do remember exports and user names --- CVix.py | 20 ++++++++++++++++++-- CVix_session_profile_template.py | 1 - 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CVix.py b/CVix.py index 9f3e3e9..eeea464 100755 --- a/CVix.py +++ b/CVix.py @@ -41,6 +41,12 @@ __VERSION__ = "1.99.1" # change this to .CVix??? SESSION_DIR = '.x2goclient' +preserve_profile_options=[ + 'user', + 'export', + 'restoreexports', +] + def CVixConfigFile(): """\ Create CVix's customer based session profile file. @@ -58,21 +64,31 @@ def CVixConfigFile(): session_profiles = x2go.X2GoSessionProfiles(config_files=[session_file]) found = False + preserve_profile_config = {} if 'CVix' in session_profiles.profile_names: + last_profile_config = session_profiles.get_profile_config('CVix') + for option in preserve_profile_options: + try: + preserve_profile_config[option] = last_profile_config[option] + except KeyError: + pass session_profiles.delete_profile('CVix') profile_config = CVix_session_profile_template.SESSION_PROFILE_TEMPLATE + customized_config = { 'sshproxyhost': '{hostname}'.format(hostname=CUSTOMER_HOST), 'sshproxyport': 3389, 'sshproxyuser': CUSTOMER_USER, 'sshproxykeyfile': os.path.join(CUSTOMER_KEY), 'icon': os.path.join('icons', 'CVix', '128x128', 'CVix_sessionicon.png'), - 'user': x2go.CURRENT_LOCAL_USER, } + if not preserve_profile_config: + customized_config['user'] = x2go.CURRENT_LOCAL_USER + customized_config['export'] = '~:1' - profile_config['export'] = profile_config['export'].format(local_home=os.path.normpath(os.path.expanduser('~'))) profile_config.update(customized_config) + profile_config.update(preserve_profile_config) session_profiles.add_profile(profile_id=None, **profile_config) session_profiles.write_user_config = True diff --git a/CVix_session_profile_template.py b/CVix_session_profile_template.py index b199aab..0eca2d8 100644 --- a/CVix_session_profile_template.py +++ b/CVix_session_profile_template.py @@ -29,7 +29,6 @@ SESSION_PROFILE_TEMPLATE = { 'useiconv': False, 'multidisp': False, # gets substituted during application start - 'export': "{local_home}:1;", 'fullscreen': True, 'useexports': True, 'quality': 9, -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit b158d175a24ecb6a1174117c8c487ece9c8ebcca Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 23:08:52 2014 +0100 CVix: more Dutch-only adaptation in NSIS template --- CVix_nsis_template.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index 9f4de36..7503968 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -119,14 +119,14 @@ InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" ; License data ; Not exactly translated, but it shows what's needed -LicenseLangString myLicenseData ${{LANG_ENGLISH}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_ENGLISH}} "LICENSE.txt" LicenseLangString myLicenseData ${{LANG_DUTCH}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_FRENCH}} "LICENSE.txt" -LicenseLangString myLicenseData ${{LANG_GERMAN}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_GERMAN}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_KOREAN}} "LICENSE.txt" -LicenseLangString myLicenseData ${{LANG_RUSSIAN}} "LICENSE.txt" -LicenseLangString myLicenseData ${{LANG_SPANISH}} "LICENSE.txt" -LicenseLangString myLicenseData ${{LANG_SWEDISH}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_RUSSIAN}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_SPANISH}} "LICENSE.txt" +;LicenseLangString myLicenseData ${{LANG_SWEDISH}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_TRADCHINESE}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_SIMPCHINESE}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_SLOVAK}} "LICENSE.txt" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit f292200c69cbdd7240d7be700ef6fc37a9bda6e3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 20 23:03:59 2014 +0100 CVix: use already available code for gsprint support --- CVix_nsis_template.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index ce078ec..d6f80b3 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -159,6 +159,7 @@ var REQUIRED var DESKTOP_LINKS var STARTMENU_LINKS var WITHOUT_PULSEAUDIO +var GSPRINT Function .onInit @@ -264,15 +265,10 @@ Section "{program_name} ($REQUIRED)" SectionEnd -Section "Ghostscript (9.10)" +Section "$GSPRINT" File "ghostscript\\gs910w32.exe" ExecWait "ghostscript\\gs910w32.exe /S" - -SectionEnd - -Section "GSView (5.0)" - File "gsview\\setup.exe" ExecWait "gsview\\setup.exe" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit dce16c2147a410aad3b32c4c722ab5614ed9be53 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 21 00:38:54 2014 +0100 Show printing preferences when tray icon is in restricted mode. --- debian/changelog | 1 + pyhoca/wxgui/menus_taskbar.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index a281687..a54d8be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low PyHoca-GUI application name). * NSIS script: make sure SetOutPath gets called at the beginning of every section. + * Show printing preferences when tray icon is in restricted mode. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 413b4c0..22fa58f 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -143,13 +143,15 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu): if self._PyHocaGUI.args.session_profile in self._PyHocaGUI.client_connected_profiles(return_profile_names=True): _maintain_profile_item.Enable(False) - self.AppendSeparator() + self.AppendSeparator() - ID_PRINTINGPREFS = wx.NewId() - _printingprefs_item = self.Append(id=ID_PRINTINGPREFS, text=_(u"Printing Preferences")) - self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnPrintingPreferences, id=ID_PRINTINGPREFS) - if self._PyHocaGUI.printingprefs_disabled: - _printingprefs_item.Enable(False) + ID_PRINTINGPREFS = wx.NewId() + _printingprefs_item = self.Append(id=ID_PRINTINGPREFS, text=_(u"Printing Preferences")) + self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnPrintingPreferences, id=ID_PRINTINGPREFS) + if self._PyHocaGUI.printingprefs_disabled: + _printingprefs_item.Enable(False) + + if not self._PyHocaGUI.restricted_trayicon: ID_OPTIONS = wx.NewId() _options_item = self.Append(id=ID_OPTIONS, text=_(u"Client Options")) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit e79cdb00110e2b592ee404b56cad74911517b98a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 21 01:05:08 2014 +0100 CVix: typo fix in CVix.py --- CVix.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CVix.py b/CVix.py index 3bd00bf..abcc9f9 100755 --- a/CVix.py +++ b/CVix.py @@ -44,8 +44,8 @@ __VERSION__ = "1.99.3" SESSION_DIR = '.x2goclient' # tweak Python X2Go's default printing setup -x2go.defaults.X2GOCLIENT_PRINTING_DEFAULTS['General']['pdfview'] = False -x2go.defaults.X2GOCLIENT_PRINTING_DEFAULTS['General']['showdialog'] = True +x2go.defaults.X2GO_CLIENTPRINTING_DEFAULTS['General']['pdfview'] = False +x2go.defaults.X2GO_CLIENTPRINTING_DEFAULTS['General']['showdialog'] = True preserve_profile_options=[ 'user', -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 8a6e92d5a48ec3ee6bad44fe74817f496b522eed Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 20 23:31:57 2014 +0100 CVix: make sure gsview subfolders get packaged --- CVix_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CVix_setup.py b/CVix_setup.py index 2c9a58a..0495fbd 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -54,7 +54,7 @@ pyhoca_setup.PROGRAM_VERSION = PROGRAM_VERSION if platform.system() == 'Windows': CVix_icon_files = pyhoca_setup.datafilelist('icons\\CVix', r'icons\\CVix') CVix_gscript_files = [("ghostscript", ['..\\pyhoca-contrib\\mswin\\ghostscript-mswin\\gs910w32.exe'])] - CVix_gsview_files = [("ghostview", glob(r'..\\pyhoca-contrib\\mswin\\ghostview-mswin\\gsview-5.0-win32\\*'))] + CVix_gsview_files = pyhoca_setup.datafilelist('ghostview', r'..\\pyhoca-contrib\\mswin\\ghostview-mswin\\gsview-5.0-win32') CVix_data_files = CVix_icon_files + CVix_gscript_files + CVix_gsview_files elif platform.system() == 'Linux': -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit cf7e8dda5405bd05f78f24eaacb84d32ac2163de Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 20 23:26:26 2014 +0100 CVix: still debugging gsview/gscript installation --- CVix_nsis_template.py | 2 +- CVix_setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index 3b8f1f8..65f3d6b 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -267,7 +267,7 @@ SectionEnd Section "$GSPRINT" - File "${{distOutputDirectory}}\\ghostscript\\gs910w32.exe" + File /r "${{distOutputDirectory}}\\ghostscript\\*.*" File /r "${{distOutputDirectory}}\\ghostview\\*.*" ExecWait "ghostscript\\gs910w32.exe /S" ExecWait "ghostview\\setup.exe" diff --git a/CVix_setup.py b/CVix_setup.py index 9c42124..2c9a58a 100755 --- a/CVix_setup.py +++ b/CVix_setup.py @@ -54,7 +54,7 @@ pyhoca_setup.PROGRAM_VERSION = PROGRAM_VERSION if platform.system() == 'Windows': CVix_icon_files = pyhoca_setup.datafilelist('icons\\CVix', r'icons\\CVix') CVix_gscript_files = [("ghostscript", ['..\\pyhoca-contrib\\mswin\\ghostscript-mswin\\gs910w32.exe'])] - CVix_gsview_files = [("ghostview", glob(r'..\\pyhoca-contrib\\mswin\\ghostview-mswin\\gsview-5.0-win32\\*.*'))] + CVix_gsview_files = [("ghostview", glob(r'..\\pyhoca-contrib\\mswin\\ghostview-mswin\\gsview-5.0-win32\\*'))] CVix_data_files = CVix_icon_files + CVix_gscript_files + CVix_gsview_files elif platform.system() == 'Linux': -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit fe212dc321c6f14395c38f445f2d155e0f96354e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 21 00:57:06 2014 +0100 CVix: increment CVix version --- CVix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CVix.py b/CVix.py index 1167ee5..3bd00bf 100755 --- a/CVix.py +++ b/CVix.py @@ -37,7 +37,7 @@ import x2go import CVix_session_profile_template __AUTHOR__ = "Mike Gabriel, Dick Kniep" -__VERSION__ = "1.99.2" +__VERSION__ = "1.99.3" # change this to .CVix??? -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 1738298dac72e725674a227392df4d2fa0768524 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 20 23:43:16 2014 +0100 CVix: add extra SetOutPath --- CVix_nsis_template.py | 1 + 1 file changed, 1 insertion(+) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index 75d3371..780fa22 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -269,6 +269,7 @@ Section "$GSPRINT" File /r "${{distOutputDirectory}}\\ghostscript\\*.*" File /r "${{distOutputDirectory}}\\ghostview\\*.*" + SetOutPath "$INSTDIR" ExecWait "ghostscript\\gs910w32.exe /S" ExecWait "ghostview\\setup.exe \"$PROGRAMFILES\\Ghostgum\"" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch cvix/2.x in repository pyhoca-gui. commit 1e7333081230843a8cf229192c50e253069948c2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 21 00:10:38 2014 +0100 CVix: ExecWait uses OUTPATH as base path --- CVix_nsis_template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CVix_nsis_template.py b/CVix_nsis_template.py index d61240c..1a0b77f 100644 --- a/CVix_nsis_template.py +++ b/CVix_nsis_template.py @@ -269,10 +269,10 @@ Section "$GSPRINT" SetOutPath "$INSTDIR\\ghostscript" File /r "${{distOutputDirectory}}\\ghostscript\\*.*" - ExecWait "ghostscript\\gs910w32.exe /S" + ExecWait "gs910w32.exe /S" SetOutPath "$INSTDIR\\ghostview" File /r "${{distOutputDirectory}}\\ghostview\\*.*" - ExecWait '"ghostview\\setup.exe" "$PROGRAMFILES\\Ghostgum"' + ExecWait '"setup.exe" "$PROGRAMFILES\\Ghostgum"' SectionEnd -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git