From cefe0747b3513f0a3e552e1047bb639a6127d0f8 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 25 Jul 2023 17:27:09 +0800 Subject: [PATCH] remove cityline account/password auto-fill feature. --- settings.py | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/settings.py b/settings.py index cd4cf90..a90fa2d 100644 --- a/settings.py +++ b/settings.py @@ -34,7 +34,7 @@ warnings.simplefilter('ignore',InsecureRequestWarning) import ssl ssl._create_default_https_context = ssl._create_unverified_context -CONST_APP_VERSION = "MaxBot (2023.07.13)" +CONST_APP_VERSION = "MaxBot (2023.07.20)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" @@ -171,7 +171,6 @@ def load_translate(): en_us["ibon_ibonqware"] = 'ibon cookie ibonqware' en_us["facebook_account"] = 'Facebook account' en_us["kktix_account"] = 'KKTIX account' - en_us["cityline_account"] = 'cityline account' en_us["urbtix_account"] = 'URBTIX account' en_us["hkticketing_account"] = 'HKTICKETING account' en_us["kham_account"] = 'KHAM account' @@ -179,7 +178,6 @@ def load_translate(): en_us["facebook_password"] = 'Facebook password' en_us["kktix_password"] = 'KKTIX password' - en_us["cityline_password"] = 'cityline password' en_us["urbtix_password"] = 'URBTIX password' en_us["hkticketing_password"] = 'HKTICKETING password' en_us["kham_password"] = 'KHAM password' @@ -266,7 +264,6 @@ def load_translate(): zh_tw["ibon_ibonqware"] = 'ibon cookie ibonqware' zh_tw["facebook_account"] = 'Facebook 帳號' zh_tw["kktix_account"] = 'KKTIX 帳號' - zh_tw["cityline_account"] = 'cityline 帳號' zh_tw["urbtix_account"] = 'URBTIX 帳號' zh_tw["hkticketing_account"] = 'HKTICKETING 帳號' zh_tw["kham_account"] = '寬宏 帳號' @@ -274,7 +271,6 @@ def load_translate(): zh_tw["facebook_password"] = 'Facebook 密碼' zh_tw["kktix_password"] = 'KKTIX 密碼' - zh_tw["cityline_password"] = 'cityline 密碼' zh_tw["urbtix_password"] = 'URBTIX 密碼' zh_tw["hkticketing_password"] = 'HKTICKETING 密碼' zh_tw["kham_password"] = '寬宏 密碼' @@ -362,7 +358,6 @@ def load_translate(): zh_cn["ibon_ibonqware"] = 'ibon cookie ibonqware' zh_cn["facebook_account"] = 'Facebook 帐号' zh_cn["kktix_account"] = 'KKTIX 帐号' - zh_cn["cityline_account"] = 'cityline 帐号' zh_cn["urbtix_account"] = 'URBTIX 帐号' zh_cn["hkticketing_account"] = 'HKTICKETING 帐号' zh_cn["kham_account"] = '宽宏 帐号' @@ -370,7 +365,6 @@ def load_translate(): zh_cn["facebook_password"] = 'Facebook 密码' zh_cn["kktix_password"] = 'KKTIX 密码' - zh_cn["cityline_password"] = 'cityline 密码' zh_cn["urbtix_password"] = 'URBTIX 密码' zh_cn["hkticketing_password"] = 'HKTICKETING 密码' zh_cn["kham_password"] = '宽宏 密码' @@ -457,7 +451,6 @@ def load_translate(): ja_jp["ibon_ibonqware"] = 'ibon cookie ibonqware' ja_jp["facebook_account"] = 'Facebookのアカウント' ja_jp["kktix_account"] = 'KKTIXのアカウント' - ja_jp["cityline_account"] = 'citylineのアカウント' ja_jp["urbtix_account"] = 'URBTIXのアカウント' ja_jp["hkticketing_account"] = 'HKTICKETINGのアカウント' ja_jp["kham_account"] = 'KHAMのアカウント' @@ -465,7 +458,6 @@ def load_translate(): ja_jp["facebook_password"] = 'Facebookのパスワード' ja_jp["kktix_password"] = 'KKTIXのパスワード' - ja_jp["cityline_password"] = 'citylineのパスワード' ja_jp["urbtix_password"] = 'URBTIXのパスワード' ja_jp["hkticketing_password"] = 'HKTICKETINGのパスワード' ja_jp["kham_password"] = 'KHAMのパスワード' @@ -606,7 +598,6 @@ def get_default_config(): config_dict["advanced"]["ibonqware"] = "" config_dict["advanced"]["facebook_account"] = "" config_dict["advanced"]["kktix_account"] = "" - config_dict["advanced"]["cityline_account"] = "" config_dict["advanced"]["urbtix_account"] = "" config_dict["advanced"]["hkticketing_account"] = "" config_dict["advanced"]["kham_account"] = "" @@ -614,7 +605,6 @@ def get_default_config(): config_dict["advanced"]["facebook_password"] = "" config_dict["advanced"]["kktix_password"] = "" - config_dict["advanced"]["cityline_password"] = "" config_dict["advanced"]["urbtix_password"] = "" config_dict["advanced"]["hkticketing_password"] = "" config_dict["advanced"]["kham_password"] = "" @@ -728,7 +718,6 @@ def btn_save_act(language_code, slience_mode=False): global txt_ibon_ibonqware global txt_facebook_account global txt_kktix_account - global txt_cityline_account global txt_urbtix_account global txt_hkticketing_account global txt_kham_account @@ -736,7 +725,6 @@ def btn_save_act(language_code, slience_mode=False): global txt_facebook_password global txt_kktix_password - global txt_cityline_password global txt_urbtix_password global txt_hkticketing_password global txt_kham_password @@ -868,7 +856,6 @@ def btn_save_act(language_code, slience_mode=False): config_dict["advanced"]["ibonqware"] = txt_ibon_ibonqware.get().strip() config_dict["advanced"]["facebook_account"] = txt_facebook_account.get().strip() config_dict["advanced"]["kktix_account"] = txt_kktix_account.get().strip() - config_dict["advanced"]["cityline_account"] = txt_cityline_account.get().strip() 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() @@ -876,7 +863,6 @@ def btn_save_act(language_code, slience_mode=False): config_dict["advanced"]["facebook_password"] = txt_facebook_password.get().strip() config_dict["advanced"]["kktix_password"] = txt_kktix_password.get().strip() - config_dict["advanced"]["cityline_password"] = txt_cityline_password.get().strip() 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() @@ -886,7 +872,6 @@ def btn_save_act(language_code, slience_mode=False): config_dict["advanced"]["ibonqware"] = encryptMe(config_dict["advanced"]["ibonqware"]) config_dict["advanced"]["facebook_password"] = encryptMe(config_dict["advanced"]["facebook_password"]) config_dict["advanced"]["kktix_password"] = encryptMe(config_dict["advanced"]["kktix_password"]) - config_dict["advanced"]["cityline_password"] = encryptMe(config_dict["advanced"]["cityline_password"]) 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"]) @@ -1279,7 +1264,6 @@ def applyNewLanguage(): global lbl_ibon_ibonqware global lbl_facebook_account global lbl_kktix_account - global lbl_cityline_account global lbl_urbtix_account global lbl_hkticketing_account global lbl_kham_account @@ -1287,7 +1271,6 @@ def applyNewLanguage(): global lbl_facebook_password global lbl_kktix_password - global lbl_cityline_password global lbl_urbtix_password global lbl_hkticketing_password global lbl_kham_password @@ -1302,7 +1285,6 @@ def applyNewLanguage(): lbl_ibon_ibonqware.config(text=translate[language_code]["ibon_ibonqware"]) lbl_facebook_account.config(text=translate[language_code]["facebook_account"]) lbl_kktix_account.config(text=translate[language_code]["kktix_account"]) - lbl_cityline_account.config(text=translate[language_code]["cityline_account"]) 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"]) @@ -1310,7 +1292,6 @@ def applyNewLanguage(): lbl_facebook_password.config(text=translate[language_code]["facebook_password"]) lbl_kktix_password.config(text=translate[language_code]["kktix_password"]) - lbl_cityline_password.config(text=translate[language_code]["cityline_password"]) 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"]) @@ -2139,28 +2120,6 @@ def AutofillTab(root, config_dict, language_code, UI_PADDING_X): group_row_count +=1 - global lbl_cityline_account - lbl_cityline_account = Label(frame_group_header, text=translate[language_code]['cityline_account']) - lbl_cityline_account.grid(column=0, row=group_row_count, sticky = E) - - global txt_cityline_account - txt_cityline_account_value = StringVar(frame_group_header, value=config_dict["advanced"]["cityline_account"].strip()) - txt_cityline_account = Entry(frame_group_header, width=30, textvariable = txt_cityline_account_value) - txt_cityline_account.grid(column=1, row=group_row_count, sticky = W) - - group_row_count +=1 - - global lbl_cityline_password - lbl_cityline_password = Label(frame_group_header, text=translate[language_code]['cityline_password']) - lbl_cityline_password.grid(column=0, row=group_row_count, sticky = E) - - global txt_cityline_password - txt_cityline_password_value = StringVar(frame_group_header, value=decryptMe(config_dict["advanced"]["cityline_password"].strip())) - txt_cityline_password = Entry(frame_group_header, width=30, textvariable = txt_cityline_password_value, show="*") - txt_cityline_password.grid(column=1, row=group_row_count, sticky = W) - - group_row_count +=1 - global lbl_urbtix_account lbl_urbtix_account = Label(frame_group_header, text=translate[language_code]['urbtix_account']) lbl_urbtix_account.grid(column=0, row=group_row_count, sticky = E)