Merge branch 'manageImageList'

addon/globalPlugins/openai/__init__.py

@@ -436,6 +436,7 @@ def script_showMainDialog(self, gesture):
 
 	@script(
 		gesture="kb:nvda+e",
+		# Translators: This is the description of a command to take a screenshot and describe it.
 		description=_("Take a screenshot and describe it")
 	)
 	def script_recognizeScreen(self, gesture):
@@ -451,11 +452,17 @@ def script_recognizeScreen(self, gesture):
 				maindialog.OpenAIDlg,
 				client=self.getClient(),
 				conf=conf,
-				pathList=[tmpPath]
+				pathList=[
+					(
+						tmpPath,
+						# Translators: This is the name of the screenshot to be described.
+						_("Screenshot"))
+				]
 			)
 
 	@script(
 		gesture="kb:nvda+o",
+		# Translators: This is the description of a command to grab the current navigator object and describe it.
 		description=_("Grab the current navigator object and describe it")
 	)
 	def script_recognizeObject(self, gesture):
@@ -466,6 +473,7 @@ def script_recognizeObject(self, gesture):
 		with mss.mss() as sct:
 			tmpPath = os.path.join(DATA_DIR, "object.png")
 			nav = api.getNavigatorObject()
+			name = nav.name
 			nav.scrollIntoView()
 			if (
 				nav.role == controlTypes.ROLE_LINK
@@ -479,11 +487,25 @@ def script_recognizeObject(self, gesture):
 				sct_img = sct.grab(monitor)
 				mss.tools.to_png(sct_img.rgb, sct_img.size, output=tmpPath)
 			from . import maindialog
+			# Translators: This is the name of the screenshot to be described.
+			default_name = _("Navigator Object")
+			name = nav.name
+			if (
+				not name
+				or not name.strip()
+				or '\n' in name
+				or len(name) > 80
+			):
+				name = default_name
+			else:
+				name = "%s (%s)" % (name.strip(), default_name)
 			gui.mainFrame.popupSettingsDialog(
 				maindialog.OpenAIDlg,
 				client=self.getClient(),
 				conf=conf,
-				pathList=[tmpPath]
+				pathList=[
+					(tmpPath, name)
+				]
 			)
 
 	@script(

addon/globalPlugins/openai/imagehelper.py

@@ -8,8 +8,17 @@
 sys.path.insert(0, additionalLibsPath)
 from openai import OpenAI
 from PIL import Image
+import fractions
 sys.path.remove(additionalLibsPath)
 
+def get_image_dimensions(path):
+	"""
+	Get the dimensions of an image.
+	"""
+	img = Image.open(path)
+	return img.size
+
+
 def resize_image(
 	src: str,
 	max_width: int = 0,