Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Code/Tools/Android/ProjectGenerator/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ def __init__(self, config: ConfigData, config_file_path: str = ""):
# Add the project generation button.
btn_generate = tk.Button(self, text="Generate Project", command=self.on_generate_project_button, underline=0)
btn_generate.grid()
_ToolTip(btn_generate, "Generate Android Project (Alt-G)")

self._init_report_ui()

Expand Down Expand Up @@ -130,9 +131,11 @@ def _init_load_save_ui(self):

btn_load = tk.Button(apg_settings_frame, text="Load", command=self.on_load_settings_button, underline=0)
btn_load.grid(row=row_number, column=2, padx=2, sticky=tk.E)
_ToolTip(btn_load, "Load settings from JSON file (Alt-L)")

btn_save = tk.Button(apg_settings_frame, text="Save", command=self.on_save_settings_button, underline=0)
btn_save.grid(row=row_number, column=3, padx=2, sticky=tk.E)
_ToolTip(btn_save, "Save settings to JSON file (Alt-S)")


def _init_keystore_settings_ui(self):
Expand Down Expand Up @@ -163,6 +166,7 @@ def _init_keystore_settings_ui(self):

btn_create = tk.Button(keystore_frame, text="Create Keystore", command=self.on_create_keystore_button, underline=0)
btn_create.grid()
_ToolTip(btn_create, "Create Android Keystore (Alt-C)")


def _init_keystore_distinguished_name_ui(self, parent_frame: tk.Frame, row:int):
Expand Down Expand Up @@ -284,6 +288,7 @@ def _append_log_message(self, msg: str):
timestamp_str = self._get_time_now_str()
self._report_text_widget.insert(tk.END, f">>{timestamp_str}>>\n{msg}\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n")
self._report_text_widget.see(tk.END) #scroll to the end.
self.update_idletasks()


def create_keystore_settings_from_widgets(self) -> KeystoreSettings:
Expand Down
14 changes: 14 additions & 0 deletions Code/Tools/Android/ProjectGenerator/test_tooltip.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,17 @@ def test_tooltip_creation_and_lifecycle(self, mock_label, mock_toplevel):
mock_tip_window.destroy.assert_called_once()
self.assertIsNone(tooltip.tip_window)
self.assertIsNone(tooltip.id)

def test_tooltip_action_buttons(self):
from main import _ToolTip
button_tips = {
"Load": "Load settings from JSON file (Alt-L)",
"Save": "Save settings to JSON file (Alt-S)",
"Create Keystore": "Create Android Keystore (Alt-C)",
"Generate Project": "Generate Android Project (Alt-G)",
}
for name, tip_text in button_tips.items():
widget = DummyWidget()
tooltip = _ToolTip(widget, tip_text)
self.assertEqual(tooltip.text, tip_text)
self.assertIn("<Enter>", widget.bindings)
Loading