4
4
from pathlib import Path
5
5
import re
6
6
import sys
7
- from tkinter import messagebox , simpledialog
8
7
from typing import Callable , Collection
9
8
10
9
from dateutil .parser import parse
11
10
import numpy
12
11
import teek
12
+ from teek .extras import more_dialogs
13
13
14
14
from packetraven import APRSDatabaseTable , APRSfi , RawAPRSTextFile , SerialTNC
15
15
from packetraven .__main__ import DEFAULT_INTERVAL_SECONDS , LOGGER , retrieve_packets
@@ -708,11 +708,10 @@ def toggle(self):
708
708
709
709
api_key = self .__configuration ['aprs_fi' ]['aprs_fi_key' ]
710
710
if api_key is None :
711
- api_key = simpledialog . askstring (
711
+ api_key = more_dialogs . ask_string (
712
712
'APRS.fi API Key' ,
713
713
'enter API key for https://aprs.fi' ,
714
714
parent = self .__windows ['main' ],
715
- show = '*' ,
716
715
)
717
716
try :
718
717
aprs_api = APRSfi (self .callsigns , api_key = api_key )
@@ -741,7 +740,7 @@ def toggle(self):
741
740
'ssh_username' not in ssh_tunnel_kwargs
742
741
or ssh_tunnel_kwargs ['ssh_username' ] is None
743
742
):
744
- ssh_username = simpledialog . askstring (
743
+ ssh_username = more_dialogs . ask_string (
745
744
'SSH Tunnel Username' ,
746
745
f'enter username for SSH host "{ ssh_tunnel_kwargs ["ssh_hostname" ]} "' ,
747
746
parent = self .__windows ['main' ],
@@ -754,12 +753,11 @@ def toggle(self):
754
753
'ssh_password' not in ssh_tunnel_kwargs
755
754
or ssh_tunnel_kwargs ['ssh_password' ] is None
756
755
):
757
- password = simpledialog . askstring (
756
+ password = more_dialogs . ask_string (
758
757
'SSH Tunnel Password' ,
759
758
f'enter password for SSH user '
760
759
f'"{ ssh_tunnel_kwargs ["ssh_username" ]} "' ,
761
760
parent = self .__windows ['main' ],
762
- show = '*' ,
763
761
)
764
762
if password is None or len (password ) == 0 :
765
763
raise ConnectionError ('missing SSH password' )
@@ -773,7 +771,7 @@ def toggle(self):
773
771
'username' not in database_kwargs
774
772
or database_kwargs ['username' ] is None
775
773
):
776
- database_username = simpledialog . askstring (
774
+ database_username = more_dialogs . ask_string (
777
775
'Database Username' ,
778
776
f'enter username for database '
779
777
f'"{ database_kwargs ["database_hostname" ]} /'
@@ -788,18 +786,17 @@ def toggle(self):
788
786
'password' not in database_kwargs
789
787
or database_kwargs ['password' ] is None
790
788
):
791
- database_password = simpledialog . askstring (
789
+ database_password = more_dialogs . ask_string (
792
790
'Database Password' ,
793
791
f'enter password for database user '
794
792
f'"{ database_kwargs ["database_username" ]} "' ,
795
793
parent = self .__windows ['main' ],
796
- show = '*' ,
797
794
)
798
795
if database_password is None or len (database_password ) == 0 :
799
796
raise ConnectionError ('missing database password' )
800
797
database_kwargs ['password' ] = database_password
801
798
if 'table' not in database_kwargs or database_kwargs ['table' ] is None :
802
- database_table = simpledialog . askstring (
799
+ database_table = more_dialogs . ask_string (
803
800
'Database Table' ,
804
801
f'enter database table name' ,
805
802
parent = self .__windows ['main' ],
@@ -858,7 +855,7 @@ def toggle(self):
858
855
self .__toggle_text .set ('Stop' )
859
856
self .__running = True
860
857
except Exception as error :
861
- messagebox . showerror (error .__class__ .__name__ , error )
858
+ teek . dialog . error (error .__class__ .__name__ , error )
862
859
if '\n ' in str (error ):
863
860
for connection_error in str (error ).split ('\n ' ):
864
861
LOGGER .error (connection_error )
0 commit comments