Fixed issues with using deflating compression in zipfiles.

This commit is contained in:
Joey Payne 2015-05-06 22:26:54 -06:00
commit 7444c9582b
3 changed files with 8 additions and 5 deletions

View file

@ -724,6 +724,8 @@ class CommandBase(object):
def compress_nw(self, nw_path): def compress_nw(self, nw_path):
compression = self.get_setting('nw_compression_level') compression = self.get_setting('nw_compression_level')
if compression.value == 0:
return
comp_dict = {'Darwin64bit': get_file('files/compressors/upx-mac'), comp_dict = {'Darwin64bit': get_file('files/compressors/upx-mac'),
'Darwin32bit': get_file('files/compressors/upx-mac'), 'Darwin32bit': get_file('files/compressors/upx-mac'),
'Linux64bit': get_file('files/compressors/upx-linux-x64'), 'Linux64bit': get_file('files/compressors/upx-linux-x64'),

View file

@ -723,6 +723,7 @@ class MainWindow(QtGui.QMainWindow, CommandBase):
icon.setPixmap(None) icon.setPixmap(None)
icon.setStyleSheet(self.icon_style) icon.setStyleSheet(self.icon_style)
else: else:
icon.setPixmap(None)
icon.setStyleSheet(self.icon_style) icon.setStyleSheet(self.icon_style)

View file

@ -3,11 +3,11 @@ import os, zipfile, io, platform
import sys, tempfile import sys, tempfile
import subprocess import subprocess
try: #try:
import zlib # import zlib
ZIP_MODE = zipfile.ZIP_DEFLATED # ZIP_MODE = zipfile.ZIP_DEFLATED
except: #except:
ZIP_MODE = zipfile.ZIP_STORED ZIP_MODE = zipfile.ZIP_STORED
DEBUG = False DEBUG = False