diff --git a/settings.py b/settings.py index ef06117..4b062a2 100644 --- a/settings.py +++ b/settings.py @@ -34,7 +34,7 @@ import ssl ssl._create_default_https_context = ssl._create_unverified_context -CONST_APP_VERSION = "MaxBot (2023.09.08)" +CONST_APP_VERSION = "MaxBot (2023.09.09)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" @@ -180,6 +180,7 @@ def load_translate(): en_us["urbtix_account"] = 'URBTIX account' en_us["hkticketing_account"] = 'HKTICKETING account' en_us["kham_account"] = 'KHAM account' + en_us["ticket_account"] = 'TICKET account' en_us["ticketplus_account"] = 'TicketPlus account' en_us["facebook_password"] = 'Facebook password' @@ -188,6 +189,7 @@ def load_translate(): en_us["urbtix_password"] = 'URBTIX password' en_us["hkticketing_password"] = 'HKTICKETING password' en_us["kham_password"] = 'KHAM password' + en_us["ticket_password"] = 'TICKET password' en_us["ticketplus_password"] = 'TicketPlus password' en_us["save_password_alert"] = 'Saving passwords to config file may expose your passwords.' @@ -276,6 +278,7 @@ def load_translate(): zh_tw["urbtix_account"] = 'URBTIX 帳號' zh_tw["hkticketing_account"] = 'HKTICKETING 帳號' zh_tw["kham_account"] = '寬宏 帳號' + zh_tw["ticket_account"] = '年代 帳號' zh_tw["ticketplus_account"] = '遠大 帳號' zh_tw["facebook_password"] = 'Facebook 密碼' @@ -284,6 +287,7 @@ def load_translate(): zh_tw["urbtix_password"] = 'URBTIX 密碼' zh_tw["hkticketing_password"] = 'HKTICKETING 密碼' zh_tw["kham_password"] = '寬宏 密碼' + zh_tw["ticket_password"] = '年代 密碼' zh_tw["ticketplus_password"] = '遠大 密碼' zh_tw["save_password_alert"] = '將密碼保存到設定檔中可能會讓您的密碼被盜。' @@ -373,6 +377,7 @@ def load_translate(): zh_cn["urbtix_account"] = 'URBTIX 帐号' zh_cn["hkticketing_account"] = 'HKTICKETING 帐号' zh_cn["kham_account"] = '宽宏 帐号' + zh_cn["ticket_account"] = '年代 帐号' zh_cn["ticketplus_account"] = '远大 帐号' zh_cn["facebook_password"] = 'Facebook 密码' @@ -381,6 +386,7 @@ def load_translate(): zh_cn["urbtix_password"] = 'URBTIX 密码' zh_cn["hkticketing_password"] = 'HKTICKETING 密码' zh_cn["kham_password"] = '宽宏 密码' + zh_cn["ticket_password"] = '年代 密码' zh_cn["ticketplus_password"] = '远大 密码' zh_cn["save_password_alert"] = '将密码保存到文件中可能会暴露您的密码。' @@ -469,6 +475,7 @@ def load_translate(): ja_jp["urbtix_account"] = 'URBTIXのアカウント' ja_jp["hkticketing_account"] = 'HKTICKETINGのアカウント' ja_jp["kham_account"] = 'KHAMのアカウント' + ja_jp["ticket_account"] = 'TICKETのアカウント' ja_jp["ticketplus_account"] = '遠大のアカウント' ja_jp["facebook_password"] = 'Facebookのパスワード' @@ -477,6 +484,7 @@ def load_translate(): ja_jp["urbtix_password"] = 'URBTIXのパスワード' ja_jp["hkticketing_password"] = 'HKTICKETINGのパスワード' ja_jp["kham_password"] = 'KHAMのパスワード' + ja_jp["ticket_password"] = 'TICKETのパスワード' ja_jp["ticketplus_password"] = '遠大のパスワード' ja_jp["save_password_alert"] = 'パスワードをファイルに保存すると、パスワードが公開される可能性があります。' @@ -618,6 +626,7 @@ def get_default_config(): config_dict["advanced"]["urbtix_account"] = "" config_dict["advanced"]["hkticketing_account"] = "" config_dict["advanced"]["kham_account"] = "" + config_dict["advanced"]["ticket_account"] = "" config_dict["advanced"]["ticketplus_account"] = "" config_dict["advanced"]["facebook_password"] = "" @@ -626,6 +635,7 @@ def get_default_config(): config_dict["advanced"]["cityline_password"] = "" config_dict["advanced"]["hkticketing_password"] = "" config_dict["advanced"]["kham_password"] = "" + config_dict["advanced"]["ticket_password"] = "" config_dict["advanced"]["ticketplus_password"] = "" config_dict["advanced"]["adblock_plus_enable"] = False @@ -739,6 +749,7 @@ def btn_save_act(language_code, slience_mode=False): global txt_urbtix_account global txt_hkticketing_account global txt_kham_account + global txt_ticket_account global txt_ticketplus_account global txt_facebook_password @@ -747,6 +758,7 @@ def btn_save_act(language_code, slience_mode=False): global txt_urbtix_password global txt_hkticketing_password global txt_kham_password + global txt_ticket_password global txt_ticketplus_password global chk_state_play_captcha_sound @@ -883,6 +895,7 @@ def btn_save_act(language_code, slience_mode=False): config_dict["advanced"]["urbtix_account"] = txt_urbtix_account.get().strip() config_dict["advanced"]["hkticketing_account"] = txt_hkticketing_account.get().strip() config_dict["advanced"]["kham_account"] = txt_kham_account.get().strip() + config_dict["advanced"]["ticket_account"] = txt_ticket_account.get().strip() config_dict["advanced"]["ticketplus_account"] = txt_ticketplus_account.get().strip() config_dict["advanced"]["facebook_password"] = txt_facebook_password.get().strip() @@ -891,6 +904,7 @@ def btn_save_act(language_code, slience_mode=False): config_dict["advanced"]["urbtix_password"] = txt_urbtix_password.get().strip() config_dict["advanced"]["hkticketing_password"] = txt_hkticketing_password.get().strip() config_dict["advanced"]["kham_password"] = txt_kham_password.get().strip() + config_dict["advanced"]["ticket_password"] = txt_ticket_password.get().strip() config_dict["advanced"]["ticketplus_password"] = txt_ticketplus_password.get().strip() config_dict["advanced"]["tixcraft_sid"] = encryptMe(config_dict["advanced"]["tixcraft_sid"]) @@ -901,6 +915,7 @@ def btn_save_act(language_code, slience_mode=False): config_dict["advanced"]["urbtix_password"] = encryptMe(config_dict["advanced"]["urbtix_password"]) config_dict["advanced"]["hkticketing_password"] = encryptMe(config_dict["advanced"]["hkticketing_password"]) config_dict["advanced"]["kham_password"] = encryptMe(config_dict["advanced"]["kham_password"]) + config_dict["advanced"]["ticket_password"] = encryptMe(config_dict["advanced"]["ticket_password"]) config_dict["advanced"]["ticketplus_password"] = encryptMe(config_dict["advanced"]["ticketplus_password"]) config_dict["advanced"]["adblock_plus_enable"] = bool(chk_state_adblock_plus.get()) @@ -1296,6 +1311,7 @@ def applyNewLanguage(): global lbl_urbtix_account global lbl_hkticketing_account global lbl_kham_account + global lbl_ticket_account global lbl_ticketplus_account global lbl_facebook_password @@ -1304,6 +1320,7 @@ def applyNewLanguage(): global lbl_urbtix_password global lbl_hkticketing_password global lbl_kham_password + global lbl_ticket_password global lbl_ticketplus_password global lbl_save_password_alert @@ -1319,6 +1336,7 @@ def applyNewLanguage(): lbl_urbtix_account.config(text=translate[language_code]["urbtix_account"]) lbl_hkticketing_account.config(text=translate[language_code]["hkticketing_account"]) lbl_kham_account.config(text=translate[language_code]["kham_account"]) + lbl_ticket_account.config(text=translate[language_code]["ticket_account"]) lbl_ticketplus_account.config(text=translate[language_code]["ticketplus_account"]) lbl_facebook_password.config(text=translate[language_code]["facebook_password"]) @@ -1327,6 +1345,7 @@ def applyNewLanguage(): lbl_urbtix_password.config(text=translate[language_code]["urbtix_password"]) lbl_hkticketing_password.config(text=translate[language_code]["hkticketing_password"]) lbl_kham_password.config(text=translate[language_code]["kham_password"]) + lbl_ticket_password.config(text=translate[language_code]["ticket_password"]) lbl_ticketplus_password.config(text=translate[language_code]["ticketplus_password"]) lbl_save_password_alert.config(text=translate[language_code]["save_password_alert"]) @@ -2246,6 +2265,28 @@ def AutofillTab(root, config_dict, language_code, UI_PADDING_X): group_row_count +=1 + global lbl_ticket_account + lbl_ticket_account = Label(frame_group_header, text=translate[language_code]['ticket_account']) + lbl_ticket_account.grid(column=0, row=group_row_count, sticky = E) + + global txt_ticket_account + txt_ticket_account_value = StringVar(frame_group_header, value=config_dict["advanced"]["ticket_account"].strip()) + txt_ticket_account = Entry(frame_group_header, width=30, textvariable = txt_ticket_account_value) + txt_ticket_account.grid(column=1, row=group_row_count, sticky = W) + + group_row_count +=1 + + global lbl_ticket_password + lbl_ticket_password = Label(frame_group_header, text=translate[language_code]['ticket_password']) + lbl_ticket_password.grid(column=0, row=group_row_count, sticky = E) + + global txt_ticket_password + txt_ticket_password_value = StringVar(frame_group_header, value=decryptMe(config_dict["advanced"]["ticket_password"].strip())) + txt_ticket_password = Entry(frame_group_header, width=30, textvariable = txt_ticket_password_value, show="*") + txt_ticket_password.grid(column=1, row=group_row_count, sticky = W) + + group_row_count +=1 + global lbl_ticketplus_account lbl_ticketplus_account = Label(frame_group_header, text=translate[language_code]['ticketplus_account']) lbl_ticketplus_account.grid(column=0, row=group_row_count, sticky = E)