Skip to content

Commit

Permalink
feat(cli): added separate option for info window screen
Browse files Browse the repository at this point in the history
Closes #388.
  • Loading branch information
jeertmans committed Mar 12, 2024
1 parent b3fe6f1 commit ceeba33
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 8 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added audio output to `manim-slides present`.
[#382](https://github.com/jeertmans/manim-slides/pull/382)

(unreleased-changed)=
### Changed

- Added `--info-window-screen` option and change `--screen-number`
to not move the info window.
[#389](https://github.com/jeertmans/manim-slides/pull/389)

(v5.1.3)=
## [v5.1.3](https://github.com/jeertmans/manim-slides/compare/v5.1.2...v5.1.3)

Expand Down
32 changes: 25 additions & 7 deletions manim_slides/present/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,14 @@ def str_to_int_or_none(value: str) -> Optional[int]:
is_flag=True,
help="Hide info window.",
)
@click.option(
"--info-window-screen",
"info_window_screen_number",
metavar="NUMBER",
type=int,
default=None,
help="Put info window on the given screen (a.k.a. display).",
)
@click.help_option("-h", "--help")
@verbosity_option
def present(
Expand All @@ -261,6 +269,7 @@ def present(
playback_rate: float,
next_terminates_loop: bool,
hide_info_window: bool,
info_window_screen_number: Optional[int],
) -> None:
"""
Present SCENE(s), one at a time, in order.
Expand Down Expand Up @@ -295,32 +304,40 @@ def present(

warn_if_non_desirable_pyside6_version()

from qtpy.QtCore import Qt
from qtpy.QtGui import QScreen

from ..qt_utils import qapp
from .player import Player

app = qapp()
app.setApplicationName("Manim Slides")

if screen_number is not None:
def get_screen(number: int) -> Optional[QScreen]:
try:
screen = app.screens()[screen_number]
return app.screens()[number]
except IndexError:
logger.error(
f"Invalid screen number {screen_number}, "
f"Invalid screen number {number}, "
f"allowed values are from 0 to {len(app.screens())-1} (incl.)"
)
screen = None
return None

Check warning on line 324 in manim_slides/present/__init__.py

View check run for this annotation

Codecov / codecov/patch

manim_slides/present/__init__.py#L324

Added line #L324 was not covered by tests

if screen_number is not None:
screen = get_screen(screen_number)
else:
screen = None

from qtpy.QtCore import Qt
if info_window_screen_number is not None:
info_window_screen = get_screen(info_window_screen_number)

Check warning on line 332 in manim_slides/present/__init__.py

View check run for this annotation

Codecov / codecov/patch

manim_slides/present/__init__.py#L332

Added line #L332 was not covered by tests
else:
info_window_screen = None

aspect_ratio_modes = {
"keep": Qt.KeepAspectRatio,
"ignore": Qt.IgnoreAspectRatio,
}

from .player import Player

player = Player(
config,
presentation_configs,
Expand All @@ -336,6 +353,7 @@ def present(
playback_rate=playback_rate,
next_terminates_loop=next_terminates_loop,
hide_info_window=hide_info_window,
info_window_screen=info_window_screen,
)

player.show()
Expand Down
5 changes: 4 additions & 1 deletion manim_slides/present/player.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ def __init__(
playback_rate: float = 1.0,
next_terminates_loop: bool = False,
hide_info_window: bool = False,
info_window_screen: Optional[QScreen] = None,
):
super().__init__()

Expand Down Expand Up @@ -240,7 +241,9 @@ def __init__(
self.slide_changed.connect(self.slide_changed_callback)

self.info = Info(
full_screen=full_screen, aspect_ratio_mode=aspect_ratio_mode, screen=screen
full_screen=full_screen,
aspect_ratio_mode=aspect_ratio_mode,
screen=info_window_screen,
)
self.info.close_event.connect(self.closeEvent)
self.info.key_press_event.connect(self.keyPressEvent)
Expand Down

0 comments on commit ceeba33

Please sign in to comment.