Skip to content

Commit

Permalink
feat: added keybinding helper
Browse files Browse the repository at this point in the history 
- fix: all accels now working only if ther scope is visible
  • Loading branch information
@Dzheremi2
Dzheremi2 committed Dec 29, 2024
1 parent d28ae95 commit 1835be2
Show file tree
Hide file tree
Showing 3 changed files with 164 additions and 75 deletions.
159 changes: 85 additions & 74 deletions chronograph/window.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class ChronographWindow(Adw.ApplicationWindow):
lrclib_window_collapsed_nothing_found_status: Adw.StatusPage = Gtk.Template.Child()

# Library view widgets
help_overlay: Gtk.ShortcutsWindow = Gtk.Template.Child()
toast_overlay: Adw.ToastOverlay = Gtk.Template.Child()
navigation_view: Adw.NavigationView = Gtk.Template.Child()
library_nav_page: Adw.NavigationPage = Gtk.Template.Child()
Expand Down Expand Up @@ -103,6 +104,7 @@ def __init__(self, **kwargs) -> None:

self.loaded_card: SongCard = None

self.set_help_overlay(self.help_overlay)
self.search_bar.connect_entry(self.search_entry)
self.library.set_filter_func(self.filtering)
self.library.set_sort_func(self.sorting)
Expand All @@ -119,9 +121,10 @@ def __init__(self, **kwargs) -> None:

def on_toggle_sidebar_action(self, *_args) -> None:
"""Toggles sidebar of `self`"""
self.overlay_split_view.set_show_sidebar(
not self.overlay_split_view.get_show_sidebar()
)
if self.navigation_view.get_visible_page() is self.library_nav_page:
self.overlay_split_view.set_show_sidebar(
not self.overlay_split_view.get_show_sidebar()
)

def reset_sync_editor(self, *_args) -> None:
self.sync_lines.remove_all()
Expand Down Expand Up @@ -229,100 +232,108 @@ def on_show_file_info_action(self, *_args) -> None:

def on_append_line_action(self, *_args) -> None:
"""Appends new `SyncLine` to `self.sync_lines`"""
self.sync_lines.append(SyncLine())
if self.navigation_view.get_visible_page() is self.sync_navigation_page:
self.sync_lines.append(SyncLine())

def on_remove_selected_line_action(self, *_args) -> None:
"""Removes selected `SyncLine` from `self.sync_lines`"""
lines = []
for line in self.sync_lines:
lines.append(line)
index = lines.index(shared.selected_line)
self.sync_lines.remove(shared.selected_line)
self.sync_lines.get_row_at_index(index).grab_focus()
if self.navigation_view.get_visible_page() is self.sync_navigation_page:
lines = []
for line in self.sync_lines:
lines.append(line)
index = lines.index(shared.selected_line)
self.sync_lines.remove(shared.selected_line)
self.sync_lines.get_row_at_index(index).grab_focus()

def on_prepend_selected_line_action(self, *_args) -> None:
"""Prepends new `SyncLine` before selected `SyncLine` in `self.sync_lines`"""
if shared.selected_line in self.sync_lines:
childs = []
for child in self.sync_lines:
childs.append(child)
index = childs.index(shared.selected_line)
if index > 0:
self.sync_lines.insert(SyncLine(), index)
elif index == 0:
self.sync_lines.prepend(SyncLine())
if self.navigation_view.get_visible_page() is self.sync_navigation_page:
if shared.selected_line in self.sync_lines:
childs = []
for child in self.sync_lines:
childs.append(child)
index = childs.index(shared.selected_line)
if index > 0:
self.sync_lines.insert(SyncLine(), index)
elif index == 0:
self.sync_lines.prepend(SyncLine())

def on_append_selected_line_action(self, *_args) -> None:
"""Appends new `SyncLine` after selected `SyncLine` in `self.sync_lines`"""
if shared.selected_line in self.sync_lines:
childs = []
for child in self.sync_lines:
childs.append(child)
index = childs.index(shared.selected_line)
self.sync_lines.insert(SyncLine(), index + 1)
if self.navigation_view.get_visible_page() is self.sync_navigation_page:
if shared.selected_line in self.sync_lines:
childs = []
for child in self.sync_lines:
childs.append(child)
index = childs.index(shared.selected_line)
self.sync_lines.insert(SyncLine(), index + 1)

def on_sync_line_action(self, *_args) -> None:
"""Syncs selected `SyncLine` with current media stream timestamp"""
pattern = r"\[([^\[\]]+)\] "
timestamp = self.controls.get_media_stream().get_timestamp() // 1000
timestamp = f"[{timestamp // 60000:02d}:{(timestamp % 60000) // 1000:02d}.{timestamp % 1000:03d}] "
if shared.selected_line in self.sync_lines:
childs = []
for child in self.sync_lines:
childs.append(child)
index = childs.index(shared.selected_line)
else:
pass

if re.search(pattern, shared.selected_line.get_text()) is None:
shared.selected_line.set_text(timestamp + shared.selected_line.get_text())
else:
replacement = rf"{timestamp}"
shared.selected_line.set_text(
re.sub(pattern, replacement, shared.selected_line.get_text())
)
if self.navigation_view.get_visible_page() is self.sync_navigation_page:
pattern = r"\[([^\[\]]+)\] "
timestamp = self.controls.get_media_stream().get_timestamp() // 1000
timestamp = f"[{timestamp // 60000:02d}:{(timestamp % 60000) // 1000:02d}.{timestamp % 1000:03d}] "
if shared.selected_line in self.sync_lines:
childs = []
for child in self.sync_lines:
childs.append(child)
index = childs.index(shared.selected_line)
else:
pass

if re.search(pattern, shared.selected_line.get_text()) is None:
shared.selected_line.set_text(timestamp + shared.selected_line.get_text())
else:
replacement = rf"{timestamp}"
shared.selected_line.set_text(
re.sub(pattern, replacement, shared.selected_line.get_text())
)

if (indexed_row := self.sync_lines.get_row_at_index(index + 1)) is not None:
indexed_row.grab_focus()
else:
pass
if (indexed_row := self.sync_lines.get_row_at_index(index + 1)) is not None:
indexed_row.grab_focus()
else:
pass

def on_replay_line_action(self, *_args) -> None:
"""Replays selected `SyncLine` for its timestamp"""
self.controls.get_media_stream().seek(
timing_parser(shared.selected_line.get_text()) * 1000
)
if self.navigation_view.get_visible_page() is self.sync_navigation_page:
self.controls.get_media_stream().seek(
timing_parser(shared.selected_line.get_text()) * 1000
)

def on_100ms_rew_action(self, *_args) -> None:
"""Rewinds media stream for 100ms from selected `SyncLine` timestamp and resync itself timestamp"""
pattern = r"\[([^\[\]]+)\]"
if (
line_timestamp_prefix := timing_parser(shared.selected_line.get_text())
) >= 100:
timestamp = line_timestamp_prefix - 100
new_timestamp = f"[{timestamp // 60000:02d}:{(timestamp % 60000) // 1000:02d}.{timestamp % 1000:03d}]"
replacement = rf"{new_timestamp}"
shared.selected_line.set_text(
re.sub(pattern, replacement, shared.selected_line.get_text())
)
self.controls.get_media_stream().seek(timestamp * 1000)
else:
replacement = rf"[00:00.000]"
shared.selected_line.set_text(
re.sub(pattern, replacement, shared.selected_line.get_text())
)
self.controls.get_media_stream().seek(0)
if self.navigation_view.get_visible_page() is self.sync_navigation_page:
pattern = r"\[([^\[\]]+)\]"
if (
line_timestamp_prefix := timing_parser(shared.selected_line.get_text())
) >= 100:
timestamp = line_timestamp_prefix - 100
new_timestamp = f"[{timestamp // 60000:02d}:{(timestamp % 60000) // 1000:02d}.{timestamp % 1000:03d}]"
replacement = rf"{new_timestamp}"
shared.selected_line.set_text(
re.sub(pattern, replacement, shared.selected_line.get_text())
)
self.controls.get_media_stream().seek(timestamp * 1000)
else:
replacement = rf"[00:00.000]"
shared.selected_line.set_text(
re.sub(pattern, replacement, shared.selected_line.get_text())
)
self.controls.get_media_stream().seek(0)

def on_100ms_forw_action(self, *_args) -> None:
"""Forwards media stream for 100ms from selected `SyncLine` timestamp and resync itself timestamp"""
timestamp = timing_parser(shared.selected_line.get_text()) + 100
new_timestamp = f"[{timestamp // 60000:02d}:{(timestamp % 60000) // 1000:02d}.{timestamp % 1000:03d}]"
shared.selected_line.set_text(
re.sub(
r"\[([^\[\]]+)\]", rf"{new_timestamp}", shared.selected_line.get_text()
if self.navigation_view.get_visible_page() is self.sync_navigation_page:
timestamp = timing_parser(shared.selected_line.get_text()) + 100
new_timestamp = f"[{timestamp // 60000:02d}:{(timestamp % 60000) // 1000:02d}.{timestamp % 1000:03d}]"
shared.selected_line.set_text(
re.sub(
r"\[([^\[\]]+)\]", rf"{new_timestamp}", shared.selected_line.get_text()
)
)
)
self.controls.get_media_stream().seek(timestamp * 1000)
self.controls.get_media_stream().seek(timestamp * 1000)

def on_import_from_clipboard_action(self, *_args) -> None:
"""Imports text from clipboard to `self.sync_lines`"""
Expand Down
78 changes: 78 additions & 0 deletions data/gtk/window.blp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,84 @@ Adw.NavigationPage sync_navigation_page {
}
}

ShortcutsWindow help_overlay {
modal: true;

ShortcutsSection {
section-name: _("shortcuts");
max-height: 10;

ShortcutsGroup {
title: _("General");

ShortcutsShortcut {
title: _("Toggle sidebar");
action-name: "win.toggle_sidebar";
}

ShortcutsShortcut {
title: _("Toggle search");
action-name: "win.toggle_search";
}

ShortcutsShortcut {
title: _("Select directory");
action-name: "win.select_dir";
}

ShortcutsShortcut {
title: _("Quit");
action-name: "app.quit";
}
}

ShortcutsGroup {
title: _("Sync mode");

ShortcutsShortcut {
title: _("Sync/Re-sync");
action-name: "win.sync_line";
}

ShortcutsShortcut {
title: _("Replay selected line");
action-name: "win.replay_line";
}

ShortcutsShortcut {
title: _("Remove selected line");
action-name: "win.remove_selected_line";
}

ShortcutsShortcut {
title: _("Prepend line to selected");
action-name: "win.prepend_selected_line";
}

ShortcutsShortcut {
title: _("Append line to selected");
action-name: "win.append_selected_line";
}

ShortcutsShortcut {
title: _("Append line to end");
action-name: "win.append_line";
}

ShortcutsShortcut {
title: _("Re-sync 100ms back");
action-name: "win.100ms_rew";
}

ShortcutsShortcut {
title: _("Re-sync 100ms forward");
action-name: "win.100ms_forw";
}
}
}
}


menu open_source_menu {
section {
item (_("Directory"), "win.select_dir")
Expand Down
2 changes: 1 addition & 1 deletion data/meson.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ blueprints = custom_target('blueprints',
'gtk/ui/BoxDialog.blp',
'gtk/ui/SyncLine.blp',
'gtk/ui/LrclibTrack.blp',
'gtk/ui/Preferences.blp'
'gtk/ui/Preferences.blp',
),
output: '.',
command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
Expand Down

0 comments on commit 1835be2

Please sign in to comment.