The branch, master has been updated via 288f8f2637ccec75be0a6ef2f4921e1e71355d77 (commit) from dfee09267d6011ac62903e23e6af29aa9e386d21 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 288f8f2637ccec75be0a6ef2f4921e1e71355d77 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Apr 21 21:09:19 2013 +0200 Provide icon2exe.py for adding .ico files to .exe files. Thanks to the original authors: Giovanni Bajo and previously McMillan Enterprises, Inc. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 + icon2exe.py | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 icon2exe.py The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2fb6238..afe2f42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ pyhoca-gui (0.4.0.2-0~x2go1) UNRELEASED; urgency=low + Use bbfreeze to freeze the Win32 version of PyHoca-GUI. + Make sure PyHoca-GUI freezing works with gevent 1.0b3 and later. + Freeze with gui_only enabled, hides the console Window PyHoca-GUI runs in. + + Provide icon2exe.py for adding .ico files to .exe files. Thanks + to the original authors: Giovanni Bajo and previously McMillan + Enterprises, Inc. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 13 Feb 2013 12:51:24 +0100 diff --git a/icon2exe.py b/icon2exe.py new file mode 100644 index 0000000..c066575 --- /dev/null +++ b/icon2exe.py @@ -0,0 +1,193 @@ +#! /usr/bin/env python +# Copyright (C) 2005, Giovanni Bajo +# Based on previous work under copyright (c) 2002 McMillan Enterprises, Inc. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +# This code has been adopted from this project: +# git://deluge-torrent.org/delugemaster + +RT_ICON = 3 +RT_GROUP_ICON = 14 +LOAD_LIBRARY_AS_DATAFILE = 2 + +import struct +import types +try: + StringTypes = types.StringTypes +except AttributeError: + StringTypes = [ type("") ] + +class Structure: + def __init__ (self): + size = self._sizeInBytes = struct.calcsize (self._format_) + self._fields_ = list (struct.unpack (self._format_, '\000' * size)) + indexes = self._indexes_ = {} + for i in range (len (self._names_)): + indexes[self._names_[i]] = i + def dump (self): + print "I: DUMP of", self + for name in self._names_: + if name[0] != '_': + print "I: %20s = %s" % (name, getattr (self, name)) + print + def __getattr__ (self, name): + if name in self._names_: + index = self._indexes_[name] + return self._fields_[index] + try: + return self.__dict__[name] + except KeyError: + raise AttributeError, name + def __setattr__ (self, name, value): + if name in self._names_: + index = self._indexes_[name] + self._fields_[index] = value + else: + self.__dict__[name] = value + def tostring (self): + return apply (struct.pack, [self._format_,] + self._fields_) + def fromfile (self, file): + data = file.read (self._sizeInBytes) + self._fields_ = list (struct.unpack (self._format_, data)) + +class ICONDIRHEADER (Structure): + _names_ = "idReserved", "idType", "idCount" + _format_ = "hhh" + +class ICONDIRENTRY (Structure): + _names_ = "bWidth", "bHeight", "bColorCount", "bReserved", "wPlanes", "wBitCount", "dwBytesInRes", "dwImageOffset" + _format_ = "bbbbhhii" + +class GRPICONDIR (Structure): + _names_ = "idReserved", "idType", "idCount" + _format_ = "hhh" + +class GRPICONDIRENTRY (Structure): + _names_ = "bWidth", "bHeight", "bColorCount", "bReserved", "wPlanes", "wBitCount", "dwBytesInRes", "nID" + _format_ = "bbbbhhih" + +class IconFile: + def __init__ (self, path): + self.path = path + file = open (path, "rb") + self.entries = [] + self.images = [] + header = self.header = ICONDIRHEADER() + header.fromfile (file) + for i in range (header.idCount): + entry = ICONDIRENTRY() + entry.fromfile (file) + self.entries.append (entry) + for e in self.entries: + file.seek (e.dwImageOffset, 0) + self.images.append (file.read (e.dwBytesInRes)) + + def grp_icon_dir (self): + return self.header.tostring() + + def grp_icondir_entries (self, id=1): + data = "" + for entry in self.entries: + e = GRPICONDIRENTRY() + for n in e._names_[:-1]: + setattr(e, n, getattr (entry, n)) + e.nID = id + id = id + 1 + data = data + e.tostring() + return data + + +def CopyIcons_FromIco (dstpath, srcpath, id=1): + import win32api #, win32con + icons = map(IconFile, srcpath) + print "I: Updating icons from", srcpath, "to", dstpath + + hdst = win32api.BeginUpdateResource (dstpath, 0) + + iconid = 1 + for i in range(len(icons)): + f = icons[i] + data = f.grp_icon_dir() + data = data + f.grp_icondir_entries(iconid) + win32api.UpdateResource (hdst, RT_GROUP_ICON, i, data) + print "I: Writing RT_GROUP_ICON %d resource with %d bytes" % (i, len(data)) + for data in f.images: + win32api.UpdateResource (hdst, RT_ICON, iconid, data) + print "I: Writing RT_ICON %d resource with %d bytes" % (iconid, len (data)) + iconid = iconid + 1 + + win32api.EndUpdateResource (hdst, 0) + +def CopyIcons (dstpath, srcpath): + import os.path, string + + if type(srcpath) in StringTypes: + srcpath = [ srcpath ] + + def splitter(s): + try: + srcpath, index = map(string.strip, string.split(s, ',')) + return srcpath, int(index) + except ValueError: + return s, None + + srcpath = map(splitter, srcpath) + print "I: SRCPATH", srcpath + + if len(srcpath) > 1: + # At the moment, we support multiple icons only from .ico files + srcs = [] + for s in srcpath: + e = os.path.splitext(s[0])[1] + if string.lower(e) != '.ico': + raise ValueError, "multiple icons supported only from .ico files" + if s[1] is not None: + raise ValueError, "index not allowed for .ico files" + srcs.append(s[0]) + return CopyIcons_FromIco(dstpath, srcs) + + srcpath,index = srcpath[0] + srcext = os.path.splitext(srcpath)[1] + if string.lower (srcext) == '.ico': + return CopyIcons_FromIco (dstpath, [srcpath]) + if index is not None: + print "I: Updating icons from", srcpath, ", %d to" % index, dstpath + else: + print "I: Updating icons from", srcpath, "to", dstpath + import win32api #, win32con + hdst = win32api.BeginUpdateResource (dstpath, 0) + hsrc = win32api.LoadLibraryEx (srcpath, 0, LOAD_LIBRARY_AS_DATAFILE) + if index is None: + grpname = win32api.EnumResourceNames (hsrc, RT_GROUP_ICON)[0] + elif index >= 0: + grpname = win32api.EnumResourceNames (hsrc, RT_GROUP_ICON)[index] + else: + grpname = -index + data = win32api.LoadResource (hsrc, RT_GROUP_ICON, grpname) + win32api.UpdateResource (hdst, RT_GROUP_ICON, grpname, data) + for iconname in win32api.EnumResourceNames (hsrc, RT_ICON): + data = win32api.LoadResource (hsrc, RT_ICON, iconname) + win32api.UpdateResource (hdst, RT_ICON, iconname, data) + win32api.FreeLibrary (hsrc) + win32api.EndUpdateResource (hdst, 0) + +if __name__ == "__main__": + import sys + + dstpath = sys.argv[1] + srcpath = sys.argv[2:] + CopyIcons(dstpath, srcpath) + hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).