From b3803637ba2a4fc0397c6cd18800fc9038dcc24a Mon Sep 17 00:00:00 2001 From: Mengjuei Date: Tue, 20 Mar 2012 22:27:03 -0700 Subject: [PATCH] Something wrong with the python code --- pyInstaller/InstallerAppDelegate.py | 173 +++++++++++++++------------- 1 file changed, 90 insertions(+), 83 deletions(-) diff --git a/pyInstaller/InstallerAppDelegate.py b/pyInstaller/InstallerAppDelegate.py index 588a2dbf..e0a102c3 100755 --- a/pyInstaller/InstallerAppDelegate.py +++ b/pyInstaller/InstallerAppDelegate.py @@ -24,89 +24,96 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN class InstallerAppDelegate(NSObject): - window = objc.IBOutlet() - licenseView = objc.IBOutlet() - licenseTextView = objc.IBOutlet() - messageLabel = objc.IBOutlet() - agreeButton = objc.IBOutlet() - cancelButton = objc.IBOutlet() - - def awakeFromNib(self): - self.window.setDelegate_(self) - self.window.setTitle_(NSLocalizedString("McBopomofo", "")) - self.agreeButton.setTitle_(NSLocalizedString("Agree", "")) - self.cancelButton.setTitle_(NSLocalizedString("Cancel", "")) - self.messageLabel.setStringValue_(NSLocalizedString("Do you agree with the license?", "")) - self.licenseTextView.textStorage().mutableString().setString_(MIT_LICENSE) - - def windowWillClose_(self, notification): - NSApp.terminate_(self) + window = objc.IBOutlet() + licenseView = objc.IBOutlet() + licenseTextView = objc.IBOutlet() + messageLabel = objc.IBOutlet() + agreeButton = objc.IBOutlet() + cancelButton = objc.IBOutlet() - def checkOSVerion(self): - mac_version = platform.mac_ver()[0].split(".") - if int(mac_version[1]) < 6: - NSRunAlertPanel(NSLocalizedString("McBopomofo requires on Mac OS X 10.6 or later verion.", ""), - NSLocalizedString("Unable to install McBopomofo on your Mac.",""), - NSLocalizedString("OK", ""), None, None) - NSApp.terminate_(self) - - def showLicenseWindow(self): - windowFrame = self.window.frame() - windowFrame.size = self.licenseView.frame().size - windowFrame.size.height += 20.0 - self.window.setFrame_display_animate_(windowFrame, True, True) - self.window.contentView().addSubview_(self.licenseView) - self.window.center() - self.window.setDefaultButtonCell_(self.agreeButton.cell()) - self.window.makeKeyAndOrderFront_(None) - - @objc.IBAction - def agreeLicenseAction_(self, sender): - self.window.orderOut_(None) - from subprocess import call - call(["/usr/bin/killall", "McBopomofo"]) - - inputMethodDir = os.path.expanduser("~/Library/Input Methods") - if os.path.exists(inputMethodDir) is False: - os.makedirs(inputMethodDir) - - packagePath = NSBundle.mainBundle().pathForResource_ofType_("McBopomofo", "app") - McBopomofoPath = os.path.join(inputMethodDir, "McBopomofo.app") - if os.path.exists(McBopomofoPath) is True: - try: - call(["/bin/cp", "-R", packagePath, McBopomofoPath]) - except: - NSRunAlertPanel(NSLocalizedString("Failed to install McBopomofo!", ""), - NSLocalizedString("Failed to overwrite existing installation.", ""), - NSLocalizedString("OK", ""), None, None) - else: - try: - shutil.copytree(packagePath, McBopomofoPath) - except: - NSRunAlertPanel(NSLocalizedString("Failed to install McBopomofo!", ""), - NSLocalizedString("Failed to copy application.", ""), - NSLocalizedString("OK", ""), None, None) - NSApp.terminate_(self) + def awakeFromNib(self): + self.window.setDelegate_(self) + self.window.setTitle_(NSLocalizedString("McBopomofo", "")) + self.agreeButton.setTitle_(NSLocalizedString("Agree", "")) + self.cancelButton.setTitle_(NSLocalizedString("Cancel", "")) + self.messageLabel.setStringValue_(NSLocalizedString("Do you agree with the license?", "")) + self.licenseTextView.textStorage().mutableString().setString_(MIT_LICENSE) - print McBopomofoPath - try: - call([os.path.join(McBopomofoPath, "Contents/MacOS/McBopomofo"), "install"]) - except: - NSRunAlertPanel(NSLocalizedString("Failed to install McBopomofo!", ""), - NSLocalizedString("Failed to activate McBopomofo", ""), - NSLocalizedString("OK", ""), None, None) - NSApp.terminate_(self) - NSRunAlertPanel(NSLocalizedString("Done!", ""), - NSLocalizedString("McBopomofo has been installed on your Mac.", ""), - NSLocalizedString("OK", ""), None, None) - NSApp.terminate_(self) + def windowWillClose_(self, notification): + NSApp.terminate_(self) + + def checkOSVerion(self): + mac_version = platform.mac_ver()[0].split(".") + if int(mac_version[1]) < 6: + NSRunAlertPanel(NSLocalizedString("McBopomofo requires on Mac OS X 10.6 or later verion.", ""), + NSLocalizedString("Unable to install McBopomofo on your Mac.",""), + NSLocalizedString("OK", ""), None, None) + NSApp.terminate_(self) + + def showLicenseWindow(self): + windowFrame = self.window.frame() + windowFrame.size = self.licenseView.frame().size + windowFrame.size.height += 20.0 + self.window.setFrame_display_animate_(windowFrame, True, True) + self.window.contentView().addSubview_(self.licenseView) + self.window.center() + self.window.setDefaultButtonCell_(self.agreeButton.cell()) + self.window.makeKeyAndOrderFront_(None) + + @objc.IBAction + def agreeLicenseAction_(self, sender): + self.window.orderOut_(None) + from subprocess import call + call(["/usr/bin/killall", "McBopomofo"]) + + inputMethodDir = os.path.expanduser("~/Library/Input Methods") + if os.path.exists(inputMethodDir) is False: + os.makedirs(inputMethodDir) + + packagePath = NSBundle.mainBundle().pathForResource_ofType_("McBopomofo", "app") + McBopomofoPath = os.path.join(inputMethodDir, "McBopomofo.app") + WrongPath = os.path.join(McBopomofoPath, "McBopomofo.app") + if os.path.exists(WrongPath) is True: + try: + shutil.rmtree(WrongPath) + except: + """do nothing""" + + if os.path.exists(McBopomofoPath) is True: + try: + call(["/bin/cp", "-R", packagePath, inputMethodDir]) + except: + NSRunAlertPanel(NSLocalizedString("Failed to install McBopomofo!", ""), + NSLocalizedString("Failed to overwrite existing installation.", ""), + NSLocalizedString("OK", ""), None, None) + else: + try: + shutil.copytree(packagePath, McBopomofoPath) + except: + NSRunAlertPanel(NSLocalizedString("Failed to install McBopomofo!", ""), + NSLocalizedString("Failed to copy application.", ""), + NSLocalizedString("OK", ""), None, None) + NSApp.terminate_(self) + + print McBopomofoPath + try: + call([os.path.join(McBopomofoPath, "Contents/MacOS/McBopomofo"), "install"]) + except: + NSRunAlertPanel(NSLocalizedString("Failed to install McBopomofo!", ""), + NSLocalizedString("Failed to activate McBopomofo", ""), + NSLocalizedString("OK", ""), None, None) + NSApp.terminate_(self) + NSRunAlertPanel(NSLocalizedString("Done!", ""), + NSLocalizedString("McBopomofo has been installed on your Mac.", ""), + NSLocalizedString("OK", ""), None, None) + NSApp.terminate_(self) + + @objc.IBAction + def disagreeLicenseAction_(self, sender): + NSApp.terminate_(self) + + def applicationDidFinishLaunching_(self, sender): + NSApp.activateIgnoringOtherApps_(True) + self.checkOSVerion() + self.showLicenseWindow() - @objc.IBAction - def disagreeLicenseAction_(self, sender): - NSApp.terminate_(self) - - def applicationDidFinishLaunching_(self, sender): - NSApp.activateIgnoringOtherApps_(True) - self.checkOSVerion() - self.showLicenseWindow() -