From 55691cca2071245e99655aefcb54da986135f92f Mon Sep 17 00:00:00 2001 From: jmdaweb Date: Mon, 24 Nov 2014 17:26:35 +0100 Subject: [PATCH 1/3] Fixed setup.py, now it takes the correct bootstrap.exe in x64 builds --- src/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/setup.py b/src/setup.py index 2b7eed40..e4c02dde 100644 --- a/src/setup.py +++ b/src/setup.py @@ -34,7 +34,7 @@ def get_architecture_files(): ("Microsoft.VC90.MFC", glob("../windows-dependencies/x86/Microsoft.VC90.MFC/*")),] elif platform.architecture()[0][:2] == "64": return [ - ("", ["../windows-dependencies/x64/oggenc2.exe", "../windows-dependencies/x86/bootstrap.exe"]), + ("", ["../windows-dependencies/x64/oggenc2.exe", "../windows-dependencies/x64/bootstrap.exe"]), ("Microsoft.VC90.CRT", glob("../windows-dependencies/x64/Microsoft.VC90.CRT/*")), ("Microsoft.VC90.MFC", glob("../windows-dependencies/x64/Microsoft.VC90.MFC/*")),] From dacbb1958627bef2e76fc234f47871f651dd0bbc Mon Sep 17 00:00:00 2001 From: jmdaweb Date: Tue, 25 Nov 2014 14:44:59 +0100 Subject: [PATCH 2/3] added the windows dependencies as a git submodule, so the users can get them only if they plan to build a binary version --- .gitmodules | 3 +++ windows-dependencies | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 windows-dependencies diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..6b0168c9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "windows-dependencies"] + path = windows-dependencies + url = https://github.com/jmdaweb/TWBlue_deps_windows.git diff --git a/windows-dependencies b/windows-dependencies new file mode 160000 index 00000000..e34b9654 --- /dev/null +++ b/windows-dependencies @@ -0,0 +1 @@ +Subproject commit e34b965499b5b99239fd2e4a661cdcbf207c4cd4 From 60507e8f6be180ef155c43274971fee776b19a1c Mon Sep 17 00:00:00 2001 From: jmdaweb Date: Thu, 27 Nov 2014 17:31:10 +0100 Subject: [PATCH 3/3] Pressing enter, spacebar or mouse left click should show window if it's not visible --- src/gui/sysTrayIcon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/sysTrayIcon.py b/src/gui/sysTrayIcon.py index d000d2a4..ee57f4a2 100644 --- a/src/gui/sysTrayIcon.py +++ b/src/gui/sysTrayIcon.py @@ -55,7 +55,7 @@ class SysTrayIcon(wx.TaskBarIcon): if (self.frame.showing): self.frame.SetFocus() else: - self.frame.onShow_hide() + self.frame.show_hide() def Destroy(self): self.menu.Destroy()