Add last and middle name to vcard

Move email and phone closer to the top
Fixes #3
more-colors^2
missionfloyd 2023-06-14 22:11:14 -06:00
parent 4d5d234090
commit 385ed51f5a
1 changed files with 14 additions and 10 deletions

View File

@ -19,7 +19,8 @@ def generate(selected_tab, keys, *values):
args["wifi_password"] = args["wifi_security"] = None
data = helpers.make_wifi_data(ssid=args["wifi_ssid"], password=args["wifi_password"], security=args["wifi_security"], hidden=args["wifi_hidden"])
elif selected_tab == "tab_vcard":
data = helpers.make_vcard_data(name=args["vcard_name"], displayname=args["vcard_displayname"], nickname=args["vcard_nickname"], street=args["vcard_address"], city=args["vcard_city"], region=args["vcard_state"], zipcode=args["vcard_zipcode"], country=args["vcard_country"], birthday=args["vcard_birthday"], email=args["vcard_email"], phone=args["vcard_phone"], fax=args["vcard_fax"], memo=args["vcard_memo"], org=args["vcard_organization"], title=args["vcard_title"], cellphone=args["vcard_phone_mobile"], url=args["vcard_url"])
name = f'{args["vcard_name_last"]};{args["vcard_name_first"]};{args["vcard_name_middle"]}'
data = helpers.make_vcard_data(name, displayname=args["vcard_displayname"], nickname=args["vcard_nickname"], street=args["vcard_address"], city=args["vcard_city"], region=args["vcard_state"], zipcode=args["vcard_zipcode"], country=args["vcard_country"], birthday=args["vcard_birthday"], email=args["vcard_email"], phone=args["vcard_phone"], fax=args["vcard_fax"], memo=args["vcard_memo"], org=args["vcard_organization"], title=args["vcard_title"], cellphone=args["vcard_phone_mobile"], url=args["vcard_url"])
elif selected_tab == "tab_mecard":
data = helpers.make_mecard_data(name=args["mecard_name"], reading=args["mecard_kananame"], nickname=args["mecard_nickname"], houseno=args["mecard_address"], city=args["mecard_city"], prefecture=args["mecard_state"], zipcode=args["mecard_zipcode"], country=args["mecard_country"], birthday=args["mecard_birthday"], email=args["mecard_email"], phone=args["mecard_phone"], memo=args["mecard_memo"])
elif selected_tab == "tab_sms":
@ -51,9 +52,18 @@ def on_ui_tabs():
inputs["wifi_security"] = gr.Radio(value="None", label="Security", choices=["None", "WEP", "WPA"])
with gr.Tab("vCard") as tab_vcard:
inputs["vcard_name"] = gr.Text(label="Name")
with gr.Row():
inputs["vcard_name_first"] = gr.Text(label="First Name")
inputs["vcard_name_middle"] = gr.Text(label="Middle Name")
inputs["vcard_name_last"] = gr.Text(label="Last Name")
inputs["vcard_displayname"] = gr.Text(label="Display Name")
inputs["vcard_nickname"] = gr.Text(label="Nickname")
with gr.Row():
inputs["vcard_email"] = gr.Text(label="Email")
inputs["vcard_url"] = gr.Text(label="URL")
with gr.Row():
inputs["vcard_phone"] = gr.Text(label="Phone")
inputs["vcard_phone_mobile"] = gr.Text(label="Mobile Phone")
inputs["vcard_organization"] = gr.Text(label="Organization")
inputs["vcard_title"] = gr.Text(label="Title")
inputs["vcard_address"] = gr.Text(label="Address")
@ -64,12 +74,6 @@ def on_ui_tabs():
inputs["vcard_zipcode"] = gr.Text(label="ZIP Code")
inputs["vcard_country"] = gr.Dropdown(label="Country", allow_custom_value=True, choices=constants.countries)
inputs["vcard_birthday"] = gr.Text(label="Birthday")
with gr.Row():
inputs["vcard_email"] = gr.Text(label="Email")
inputs["vcard_url"] = gr.Text(label="URL")
with gr.Row():
inputs["vcard_phone"] = gr.Text(label="Phone")
inputs["vcard_phone_mobile"] = gr.Text(label="Mobile Phone")
inputs["vcard_fax"] = gr.Text(label="Fax")
inputs["vcard_memo"] = gr.Text(label="Memo")
@ -77,6 +81,8 @@ def on_ui_tabs():
inputs["mecard_name"] = gr.Text(label="Name")
inputs["mecard_kananame"] = gr.Text(label="Kana Name")
inputs["mecard_nickname"] = gr.Text(label="Nickname")
inputs["mecard_email"] = gr.Text(label="Email")
inputs["mecard_phone"] = gr.Text(label="Phone")
inputs["mecard_address"] = gr.Text(label="Address")
with gr.Row():
inputs["mecard_city"] = gr.Text(label="City")
@ -85,8 +91,6 @@ def on_ui_tabs():
inputs["mecard_zipcode"] = gr.Text(label="ZIP Code")
inputs["mecard_country"] = gr.Dropdown(label="Country", allow_custom_value=True, choices=constants.countries)
inputs["mecard_birthday"] = gr.Text(label="Birthday")
inputs["mecard_email"] = gr.Text(label="Email")
inputs["mecard_phone"] = gr.Text(label="Phone")
inputs["mecard_memo"] = gr.Text(label="Memo")
with gr.Tab("SMS") as tab_sms: