ScriptForge - Console + progress bar receive a Close icon

Next dialogs:
- dlgConsole (modal or non-modal)
- dlgProgress (non-modal)
had a Close button with label "Close" or a translation.

The "Close" text is replaced with a "Cancel" icon.

Objective: make console and progress bar user-language independent.

No impact either on user documentation or on Python part.

Change-Id: Ib1c2370986d47ccab49c6d42500231fd73b9ff3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131255
Tested-by: Jean-Pierre Ledure <jp@ledure.be>
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure <jp@ledure.be>

7 files changed, 5 insertions, 23 deletions

diff --git a/wizards/source/scriptforge/SF_Exception.xba b/wizards/source/scriptforge/SF_Exception.xba
index 3d28153a5a40..2af37d9534f2 100644
--- a/wizards/source/scriptforge/SF_Exception.xba
+++ b/wizards/source/scriptforge/SF_Exception.xba
@@ -266,7 +266,6 @@ Public Sub Console(Optional ByVal Modal As Variant, _
 '''		SF_Exception.Console()
 
 Dim bConsoleActive As Boolean		'	When True, dialog is active
-Dim sClose As String				'	Caption of the close buttons
 Dim oModalBtn As Object				'	Modal close button
 Dim oNonModalBtn As Object			'	Non modal close button
 Const cstThisSub = "Exception.Console"
@@ -295,10 +294,8 @@ Try:
 			'		- a Default button triggering the Close action
 			Set .ConsoleDialog = CreateScriptService("SFDialogs.Dialog", "GlobalScope", "ScriptForge", "dlgConsole", _Context)
 			'	Setup labels and visibility
-			sClose = .Interface.GetText("CLOSEBUTTON")
 			Set oModalBtn = .ConsoleDialog.Controls("CloseModalButton")
 			Set oNonModalBtn = .ConsoleDialog.Controls("CloseNonModalButton")
-			If Modal Then oModalBtn.Caption = sClose Else oNonModalBtn.Caption = sClose
 			oModalBtn.Visible = Modal
 			oNonModalBtn.Visible = CBool(Not Modal)
 			'	Load console lines
diff --git a/wizards/source/scriptforge/SF_Root.xba b/wizards/source/scriptforge/SF_Root.xba
index d7c4cc639737..0ed77373d773 100644
--- a/wizards/source/scriptforge/SF_Root.xba
+++ b/wizards/source/scriptforge/SF_Root.xba
@@ -308,10 +308,6 @@ Try:
 		Set Interface = CreateScriptService("L10N")
 		With Interface
 	'	SF_Exception.Raise
-			.AddText(	Context := "CLOSEBUTTON" _
-						, MsgId := "Close" _
-						, Comment :=	"Text in close buttons of progress and console dialog boxes" _
-					)
 			.AddText(	Context := "ERRORNUMBER" _
 						, MsgId := "Error %1" _
 						, Comment :=	"Title in error message box\n" _
diff --git a/wizards/source/scriptforge/SF_UI.xba b/wizards/source/scriptforge/SF_UI.xba
index 1caa90039264..8c511a35cc8d 100644
--- a/wizards/source/scriptforge/SF_UI.xba
+++ b/wizards/source/scriptforge/SF_UI.xba
@@ -1115,7 +1115,6 @@ Try:
 				If bFirstCall Then
 					Set oFixedText = .Controls("ProgressText")
 					Set oProgressBar = .Controls("ProgressBar")
-					.Controls("CloseButton").Caption = _SF_.Interface.GetText("CLOSEBUTTON")
 					.Execute(Modal := False)
 				End If
 				If Len(Text) > 0 Then oFixedText.Caption = Text
diff --git a/wizards/source/scriptforge/dlgConsole.xdl b/wizards/source/scriptforge/dlgConsole.xdl
index 626be565d8b7..64009f571c2f 100644
--- a/wizards/source/scriptforge/dlgConsole.xdl
+++ b/wizards/source/scriptforge/dlgConsole.xdl
@@ -6,9 +6,9 @@
  </dlg:styles>
  <dlg:bulletinboard>
   <dlg:textfield dlg:style-id="0" dlg:id="ConsoleLines" dlg:tab-index="0" dlg:left="4" dlg:top="2" dlg:width="312" dlg:height="225" dlg:hscroll="true" dlg:vscroll="true" dlg:multiline="true" dlg:readonly="true"/>
-  <dlg:button dlg:id="CloseNonModalButton" dlg:tab-index="2" dlg:left="265" dlg:top="228" dlg:width="50" dlg:height="10" dlg:default="true" dlg:value="Close">
+  <dlg:button dlg:id="CloseNonModalButton" dlg:tab-index="2" dlg:left="265" dlg:top="228" dlg:width="50" dlg:height="10" dlg:default="true" dlg:image-src="private:graphicrepository/cmd/sc_cancel.png">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ScriptForge.SF_Exception._CloseConsole?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
-  <dlg:button dlg:id="CloseModalButton" dlg:tab-index="1" dlg:left="265" dlg:top="228" dlg:width="50" dlg:height="10" dlg:default="true" dlg:value="Close" dlg:button-type="ok"/>
+  <dlg:button dlg:id="CloseModalButton" dlg:tab-index="1" dlg:left="265" dlg:top="228" dlg:width="50" dlg:height="10" dlg:default="true" dlg:button-type="ok" dlg:image-src="private:graphicrepository/cmd/sc_cancel.png"/>
  </dlg:bulletinboard>
 </dlg:window>
\ No newline at end of file
diff --git a/wizards/source/scriptforge/dlgProgress.xdl b/wizards/source/scriptforge/dlgProgress.xdl
index cdb8f313214b..9d5f2776d44d 100644
--- a/wizards/source/scriptforge/dlgProgress.xdl
+++ b/wizards/source/scriptforge/dlgProgress.xdl
@@ -4,7 +4,7 @@
  <dlg:bulletinboard>
   <dlg:text dlg:id="ProgressText" dlg:tab-index="1" dlg:left="16" dlg:top="7" dlg:width="245" dlg:height="8" dlg:value="ProgressText" dlg:tabstop="true"/>
   <dlg:progressmeter dlg:id="ProgressBar" dlg:tab-index="0" dlg:left="16" dlg:top="18" dlg:width="190" dlg:height="10" dlg:value="50"/>
-  <dlg:button dlg:id="CloseButton" dlg:tab-index="2" dlg:left="210" dlg:top="18" dlg:width="50" dlg:height="10" dlg:value="Close">
+  <dlg:button dlg:id="CloseButton" dlg:tab-index="2" dlg:left="210" dlg:top="18" dlg:width="50" dlg:height="10" dlg:image-src="private:graphicrepository/cmd/sc_cancel.png">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ScriptForge.SF_UI._CloseProgressBar?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
  </dlg:bulletinboard>
diff --git a/wizards/source/scriptforge/po/ScriptForge.pot b/wizards/source/scriptforge/po/ScriptForge.pot
index 7db51ffc5f60..b1727527da58 100644
--- a/wizards/source/scriptforge/po/ScriptForge.pot
+++ b/wizards/source/scriptforge/po/ScriptForge.pot
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2022-03-01 15:25:24\n"
+"POT-Creation-Date: 2022-03-09 14:52:15\n"
 "PO-Revision-Date: YYYY-MM-DD HH:MM:SS\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -26,11 +26,6 @@ msgstr ""
 "X-Generator: LibreOffice - ScriptForge\n"
 "X-Accelerator-Marker: ~\n"
 
-#. Text in close buttons of progress and console dialog boxes
-msgctxt "CLOSEBUTTON"
-msgid  "Close"
-msgstr ""
-
 #. Title in error message box
 #. %1: an error number
 #, kde-format
diff --git a/wizards/source/scriptforge/po/en.po b/wizards/source/scriptforge/po/en.po
index 7db51ffc5f60..b1727527da58 100644
--- a/wizards/source/scriptforge/po/en.po
+++ b/wizards/source/scriptforge/po/en.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2022-03-01 15:25:24\n"
+"POT-Creation-Date: 2022-03-09 14:52:15\n"
 "PO-Revision-Date: YYYY-MM-DD HH:MM:SS\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -26,11 +26,6 @@ msgstr ""
 "X-Generator: LibreOffice - ScriptForge\n"
 "X-Accelerator-Marker: ~\n"
 
-#. Text in close buttons of progress and console dialog boxes
-msgctxt "CLOSEBUTTON"
-msgid  "Close"
-msgstr ""
-
 #. Title in error message box
 #. %1: an error number
 #, kde-format