Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor classnames to match style, mv magic strings to config #531

Merged
merged 1 commit into from
Jul 26, 2021
Merged

Refactor classnames to match style, mv magic strings to config #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 15 additions & 11 deletions bundledApps/WAIL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,25 +209,29 @@ def create_menu(self):
# self.Bind(wx.EVT_MENU, self.selectall, self.edit_select_all)

view_basic = self.add_menu_item(
view_menu, config.menu_title_view_view_basic, "CTRL+0"
view_menu, config.menu_title_view_view_basic,
config.menu_shortcut_view_view_basic
)
view_menu.AppendSeparator()
adv = self.add_menu_item(
view_menu, config.menu_title_view_view_advanced)
adv.Enable(0)

view_services = self.add_menu_item(
view_menu, config.menu_title_view_view_advanced_services, "CTRL+1"
view_menu, config.menu_title_view_view_advanced_services,
config.menu_shortcut_view_view_advanced_services
)
view_wayback = self.add_menu_item(
view_menu, config.menu_title_view_view_advanced_wayback, "CTRL+2"
view_menu, config.menu_title_view_view_advanced_wayback,
config.menu_shortcut_view_view_advanced_wayback
)
view_heritrix = self.add_menu_item(
view_menu, config.menu_title_view_view_advanced_heritrix, "CTRL+3"
view_menu, config.menu_title_view_view_advanced_heritrix,
config.menu_shortcut_view_view_advanced_heritrix
)
view_miscellaneous = self.add_menu_item(
view_menu, config.menu_title_view_view_advanced_miscellaneous,
"CTRL+4"
config.menu_shortcut_view_view_advanced_miscellaneous
)

window_wail = window_menu.AppendCheckItem(
Expand All @@ -240,7 +244,7 @@ def create_menu(self):
window_wail)

help_preferences = help_menu.Append(wx.ID_PREFERENCES,
"Preferences...\tCTRL+,")
f'{config.menu_title_about_preferences}\t{config.menu_shortcut_about_preferences}')
help_preferences.Enable(0) # TODO: implement

if util.is_macOS(): # About at top
Expand Down Expand Up @@ -285,7 +289,7 @@ def create_menu(self):
if wail_menu is not None:
for m in wail_menu.GetMenuItems():
if m.GetId() == wx.ID_EXIT:
m.SetItemLabel("Quit WAIL\tCTRL+Q")
m.SetItemLabel(f'{config.menu_title_about_quit}\t{config.menu_shortcut_about_quit}')

self.SetMenuBar(menu_bar)

Expand Down Expand Up @@ -805,7 +809,7 @@ def view_archive_in_browser(self, button, latest_memento=False):


class WAILGUIFrame_Advanced(wx.Panel):
class services_panel(wx.Panel, threading.Thread):
class ServicesPanel(wx.Panel, threading.Thread):
def __init__(self, parent):
wx.Panel.__init__(self, parent)

Expand Down Expand Up @@ -1119,7 +1123,7 @@ def open_wayback_configuration(_):
elif util.is_linux():
subprocess.call(("xdg-open", file_path))

class heritrix_panel(wx.Panel):
class HeritrixPanel(wx.Panel):
def __init__(self, parent):
wx.Panel.__init__(self, parent)

Expand Down Expand Up @@ -1564,11 +1568,11 @@ def __init__(self, parent):

self.SetSizer(vbox)

self.services_panel = WAILGUIFrame_Advanced.services_panel(
self.services_panel = WAILGUIFrame_Advanced.ServicesPanel(
self.notebook)
self.wayback_panel = WAILGUIFrame_Advanced.WaybackPanel(
self.notebook)
self.heritrix_panel = WAILGUIFrame_Advanced.heritrix_panel(
self.heritrix_panel = WAILGUIFrame_Advanced.HeritrixPanel(
self.notebook)
self.miscellaneous_panel = WAILGUIFrame_Advanced.MiscellaneousPanel(
self.notebook)
Expand Down
14 changes: 14 additions & 0 deletions bundledApps/WAILConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@
menu_title_help = "&Help"
menu_title_file_new_crawl = "&New Crawl"

menu_title_about_preferences = "Preferences..."
menu_title_about_quit = "Quit WAIL"

menu_title_file_all_crawls = "All Crawls"
menu_title_file_all_crawls_finish = "Finish"
menu_title_file_all_crawls_pause = "Pause"
Expand Down Expand Up @@ -182,6 +185,17 @@
menu_rebuild_job = "Rebuild job"
menu_rebuild_and_launch_job = "Rebuild and launch job"

menu_shortcut_about_preferences = 'CTRL+,'
menu_shortcut_about_quit = 'CTRL+Q'

menu_shortcut_view_view_basic = "CTRL+0"
menu_shortcut_view_view_advanced_services = "CTRL+1"
menu_shortcut_view_view_advanced_wayback = "CTRL+2"
menu_shortcut_view_view_advanced_heritrix = "CTRL+3"
menu_shortcut_view_view_advanced_miscellaneous = "CTRL+4"



heritrix_credentials_username = "lorem"
heritrix_credentials_password = "ipsum"

Expand Down