Skip to content

Commit

Permalink
Several fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rgargente committed Mar 3, 2019
1 parent 12ee51b commit 7b8b6c3
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 5 deletions.
19 changes: 17 additions & 2 deletions dcsrosetta.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import sys
import webbrowser
from threading import Thread

Expand Down Expand Up @@ -31,7 +32,8 @@ def __init__(self):
self.yandex_translator = DcsYandexTranlator()
self.window.FindElement('yandex_key').Update(self.yandex_translator.key)
self.langs_dict = self.yandex_translator.get_langs()
self.window.FindElement('from_lang').Update(values=['Auto'] + list(self.langs_dict.keys()))
if self.langs_dict:
self.update_langs()

self.run()

Expand Down Expand Up @@ -62,12 +64,25 @@ def run(self):
elif event == 'new_version':
webbrowser.open('https://github.com/rgargente/dcsrosetta/releases')

def update_langs(self):
self.window.FindElement('from_lang').Update(values=['Auto'] + list(self.langs_dict.keys()))

def save_yandex_key(self, value):
self.yandex_translator.save_key(value)
self.langs_dict = self.yandex_translator.get_langs()
self.update_langs()

def change_languages(self, from_lang):
self.window.FindElement('to_lang').Update(values=self.langs_dict[from_lang])


if __name__ == '__main__':
DcsRosettaApp()
try:
DcsRosettaApp()
except Exception as e:
old_stdout = sys.stdout
log_file = open("message.log", "w")
sys.stdout = log_file
print(e)
sys.stdout = old_stdout
log_file.close()
4 changes: 4 additions & 0 deletions dcsyandex.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def save_key(self, key: str):
with open(self.YANDEX_KEY_FILE, 'w') as f:
f.write(key)
print("Yandex key saved")
self.load_key()

def translate(self, desc, from_lang, to_lang):
self.translator.set_text(desc)
Expand All @@ -39,6 +40,9 @@ def translate(self, desc, from_lang, to_lang):
return response

def get_langs(self):
if not self.translator:
print('Please set your Yandex key')
return None
langs_dict = {}
langs_list = self.translator.get_langs()
for pair in langs_list:
Expand Down
2 changes: 1 addition & 1 deletion deploy.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pyinstaller --noconsole -i rosetta.ico --add-data "rosetta.ico;." --onefile dcsrosetta.py
pyinstaller --noconsole -i rosetta.ico --add-data "rosetta.ico;." --add-data "version.txt;." --onefile dcsrosetta.py
10 changes: 8 additions & 2 deletions version.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import socket
import requests

from paths import resource_path


def get_version():
with open('version.txt') as f:
version = f.readline()
version = 'unkown'
try:
with open(resource_path('version.txt')) as f:
version = f.readline()
except Exception as e:
print(e)
return version


Expand Down

0 comments on commit 7b8b6c3

Please sign in to comment.