Skip to content

Commit 0da2fa4

Browse files
seanbuddseanbudd
authored
Merge 8cb1957 into f47eb66 
2 parents f47eb66 + 8cb1957 commit 0da2fa4

12 files changed

Lines changed: 575 additions & 148 deletions

File tree

‎source/core.py‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -550,12 +550,7 @@ def onEndSession(evt):
550550
wx.CallAfter(audioDucking.initialize)
551551

552552
from winAPI.messageWindow import WindowMessage
553-
from winAPI.sessionTracking import (
554-
handleSessionChange,
555-
registerSessionNotification,
556-
unregisterSessionNotification,
557-
WindowsTrackedSession,
558-
)
553+
from winAPI import sessionTracking
559554
import winUser
560555
# #3763: In wxPython 3, the class name of frame windows changed from wxWindowClassNR to wxWindowNR.
561556
# NVDA uses the main frame to check for and quit another instance of NVDA.
@@ -584,8 +579,8 @@ def __init__(self, windowName=None):
584579
self.orientationCoordsCache = (0,0)
585580
self.handlePowerStatusChange()
586581

587-
# Call must be paired with a call to unregisterSessionNotification
588-
self._isSessionTrackingRegistered = registerSessionNotification(self.handle)
582+
# Call must be paired with a call to sessionTracking.unregister
583+
self._isSessionTrackingRegistered = sessionTracking.register(self.handle)
589584

590585
def warnIfSessionTrackingNotRegistered(self) -> None:
591586
if self._isSessionTrackingRegistered:
@@ -613,18 +608,18 @@ def destroy(self):
613608
"""
614609
if self._isSessionTrackingRegistered:
615610
# Requires an active message window and a handle to unregister.
616-
unregisterSessionNotification(self.handle)
611+
sessionTracking.unregister(self.handle)
617612
super().destroy()
618613

619614
def windowProc(self, hwnd, msg, wParam, lParam):
620615
post_windowMessageReceipt.notify(msg=msg, wParam=wParam, lParam=lParam)
621-
if msg == WindowMessage.POWERBROADCAST and wParam == self.PBT_APMPOWERSTATUSCHANGE:
616+
if msg == WindowMessage.POWER_BROADCAST and wParam == self.PBT_APMPOWERSTATUSCHANGE:
622617
self.handlePowerStatusChange()
623618
elif msg == winUser.WM_DISPLAYCHANGE:
624619
self.handleScreenOrientationChange(lParam)
625-
elif msg == WindowMessage.WTSSESSION_CHANGE:
626-
# If we are receiving WTSSESSION_CHANGE events, _isSessionTrackingRegistered should be True
627-
handleSessionChange(WindowsTrackedSession(wParam), lParam)
620+
elif msg == WindowMessage.WTS_SESSION_CHANGE:
621+
# If we are receiving WTS_SESSION_CHANGE events, _isSessionTrackingRegistered should be True
622+
sessionTracking.handleSessionChange(sessionTracking.WindowsTrackedSession(wParam), lParam)
628623

629624
def handleScreenOrientationChange(self, lParam):
630625
# TODO: move to winAPI

‎source/locale/hr/LC_MESSAGES/nvda.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ msgid ""
1212
msgstr ""
1313
"Project-Id-Version: NVDA\n"
1414
"Report-Msgid-Bugs-To: \n"
15-
"POT-Creation-Date: 2022-07-29 00:02+0000\n"
16-
"PO-Revision-Date: 2022-07-29 02:36+0200\n"
15+
"POT-Creation-Date: 2022-08-12 00:02+0000\n"
16+
"PO-Revision-Date: 2022-08-13 22:41+0700\n"
1717
"Last-Translator: Zvonimir <9a5dsz@gozaltech.org>\n"
1818
"Language-Team: Hr Zvonimir Stanecic <9a5dsz@gozaltech.org>\n"
1919
"Language: hr\n"
@@ -446,7 +446,7 @@ msgstr "⡅⠕⠍"
446446

447447
#. Translators: Displayed in braille when an object is a suggestion.
448448
msgid "sggstn"
449-
msgstr ""
449+
msgstr "⠏⠗⠊⠚"
450450

451451
#. Translators: Displayed in braille when an object is a definition.
452452
#. Translators: Identifies a definition.

‎source/locale/ka/LC_MESSAGES/nvda.po‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: NVDA_georgian_translation\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2022-08-05 00:02+0000\n"
6-
"PO-Revision-Date: 2022-08-07 14:48+0400\n"
5+
"POT-Creation-Date: 2022-08-12 00:02+0000\n"
6+
"PO-Revision-Date: 2022-08-15 19:30+0400\n"
77
"Last-Translator: Dragan Ratkovich\n"
88
"Language-Team: Georgian translation team <admin@gozaltech.org>\n"
99
"Language: ka\n"
@@ -3518,7 +3518,7 @@ msgstr "ხმის რეჟიმი მეტყველება"
35183518
msgid ""
35193519
"Moves the focus out of the current embedded object and into the document "
35203520
"that contains it"
3521-
msgstr "გადაყავს ფოკუსი მიმდინარე ჩაშენებული ობიექტიდან მის შემცველ დოკუმენტში"
3521+
msgstr "გადაყავს ფოკუსი მიმდინარე ჩასმული ობიექტიდან მის შემცველ დოკუმენტში"
35223522

35233523
#. Translators: Input help mode message for toggle focus and browse mode command
35243524
#. in web browsing and other situations.
@@ -6341,7 +6341,7 @@ msgstr "ხელმისაწვდომია NVDA {version} ვერს
63416341

63426342
#. Translators: The label of a button to download an NVDA update.
63436343
msgid "&Download update"
6344-
msgstr "განახლების &ჩამოტვირთვა"
6344+
msgstr "განახლების ჩა&მოტვირთვა"
63456345

63466346
#. Translators: The label of a button to remind the user later about performing some action.
63476347
msgid "Remind me &later"
@@ -7762,7 +7762,7 @@ msgstr "საქაღალდეთა პანელი"
77627762

77637763
#. Translators: Identifies an object that is embedded in a document.
77647764
msgid "embedded object"
7765-
msgstr "ჩადგმული ობიეკტი"
7765+
msgstr "ჩასმული ობიეკტი"
77667766

77677767
#. Translators: Identifies an end note.
77687768
msgid "end note"
@@ -11096,7 +11096,7 @@ msgstr "%s ელემენტით"
1109611096
#. Translators: Indicates end of something (example output: at the end of a list, speaks out of list).
1109711097
#, python-format
1109811098
msgid "out of %s"
11099-
msgstr "%sის გარეთ"
11099+
msgstr "%sს გარეთ"
1110011100

1110111101
#. Translators: Indicates the page number in a document.
1110211102
#. %s will be replaced with the page number.

0 commit comments

Comments
 (0)