Merge branch 'master' into release

actlaboratory · Oct 10, 2022 · efcab6d · efcab6d
2 parents a64c651 + c5ca2e0
commit efcab6d
Show file tree

Hide file tree

Showing 16 changed files with 620 additions and 441 deletions.
diff --git a/app.py b/app.py
@@ -11,6 +11,7 @@
 import update
 import threading
 import constants
+import soundPlayer
 
 def _import():
 	global main, manager, twitcasting
@@ -78,6 +79,8 @@ def setProxyEnviron(self):
 			self.proxyEnviron.set_environ(self.config["proxy"]["server"], self.config.getint("proxy", "port", 8080, 0, 65535))
 		else:
 			self.proxyEnviron.set_environ()
+		if "http_proxy" in os.environ:
+			soundPlayer.player.setProxy(os.environ["http_proxy"])
 
 	def installThreadExcepthook(self):
 		_init = threading.Thread.__init__

diff --git a/constants.py b/constants.py
@@ -7,7 +7,7 @@
 #アプリケーション基本情報
 APP_NAME="TCV"
 APP_FULL_NAME = "TwitCasting Viewer"
-APP_VERSION="3.2.2"
+APP_VERSION="3.3.0"
 APP_LAST_RELEASE_DATE = "2021-07-24"
 APP_ICON = None
 APP_COPYRIGHT_YEAR="2019-2022"

diff --git a/defaultKeymap.py b/defaultKeymap.py
@@ -8,6 +8,7 @@
 	"CONNECT":"CTRL+N",
 	"VIEW_HISTORY": "CTRL+H",
 	"VIEW_FAVORITES": "CTRL+I",
+	"VIEW_POPULAR": "",
 	"DISCONNECT":"CTRL+W/CTRL+F4",
 	"EXIT": "",
 	"PLAY": "F1",

diff --git a/locale/en-us/LC_MESSAGES/messages.mo b/locale/en-us/LC_MESSAGES/messages.mo