Skip to content

Commit aca73d9

Browse files
committed
Simplified show_window
1 parent 85bf399 commit aca73d9

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

castervoice/lib/merge/ccrmerging2/hooks/standard_hooks/show_window_on_error_hook.py

+3-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from castervoice.lib import settings, textformat
1+
from castervoice.lib import settings, textformat, utilities
22
from castervoice.lib.merge.ccrmerging2.hooks.base_hook import BaseHook
33
from castervoice.lib.merge.ccrmerging2.hooks.events.event_types import EventType
44
from castervoice.lib import printer
@@ -8,21 +8,8 @@
88
from dragonfly.windows.window import Window
99

1010
def show_window():
11-
title = None
12-
engine = get_current_engine().name
13-
if engine == 'natlink':
14-
import natlinkstatus # pylint: disable=import-error
15-
status = natlinkstatus.NatlinkStatus()
16-
if status.NatlinkIsEnabled() == 1:
17-
if six.PY2:
18-
title = "Messages from Python Macros"
19-
else:
20-
title= "Messages from Natlink"
21-
else:
22-
title = "Caster: Status Window"
23-
if engine != 'natlink':
24-
title = "Caster: Status Window"
25-
windows = Window.get_matching_windows(title=title)
11+
window_title = utilities.get_caster_messaging_window()
12+
windows = Window.get_matching_windows(title=window_title)
2613
if windows:
2714
windows[0].set_foreground()
2815

0 commit comments

Comments
 (0)