From 95f8ad6769adb3debd8d7365ef68149a5917e644 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Thu, 5 Mar 2020 20:55:14 +0100 Subject: [PATCH] Added configuration dialog --- Redaction/Clean.xba | 5 ++++- Redaction/ConfigDialog.xdl | 10 +++++++++ Redaction/Configuration.xba | 44 ++++++++++++++++++++++++++++++++----- Redaction/dialog.xlb | 4 +++- Redaction/script.xlb | 2 +- 5 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 Redaction/ConfigDialog.xdl diff --git a/Redaction/Clean.xba b/Redaction/Clean.xba index b638190..eccd76d 100644 --- a/Redaction/Clean.xba +++ b/Redaction/Clean.xba @@ -1,6 +1,6 @@ -Sub mark23 +Sub mark24 End Sub @@ -15,6 +15,9 @@ Sub cleanButton End Sub +Sub makerUpMenu() +End Sub + Private Sub quietCleaning Dim description As String Dim statusIndicator as Object diff --git a/Redaction/ConfigDialog.xdl b/Redaction/ConfigDialog.xdl new file mode 100644 index 0000000..5e124fd --- /dev/null +++ b/Redaction/ConfigDialog.xdl @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Redaction/Configuration.xba b/Redaction/Configuration.xba index ac8eb0e..73f75fb 100644 --- a/Redaction/Configuration.xba +++ b/Redaction/Configuration.xba @@ -1,6 +1,6 @@ -Public Const redactionExtenstionName As String = "cleanAndValidate" +Public Const redactionExtensionName As String = "cleanAndValidate" Function initRedactionConfiguration() On Error Goto exceptionHandler @@ -9,9 +9,9 @@ Function initRedactionConfiguration() Dim props(2) As New com.sun.star.beans.PropertyValue regFactory = CreateUnoService("com.sun.star.ucb.Store") - reg = regFactory.createPropertySetRegistry(redactionExtenstionName) + reg = regFactory.createPropertySetRegistry(redactionExtensionName) - redactionProps = reg.openPropertySet(redactionExtenstionName, TRUE) + redactionProps = reg.openPropertySet(redactionExtensionName, TRUE) redactionProps.addProperty("complexity", 128, "user") initConfigureation = redactionProps exceptionHandler: @@ -19,9 +19,43 @@ Function initRedactionConfiguration() initRedactionConfiguration = redactionProps End Function -Sub setRedactionComplexity(complexityLevel) +Private Sub setConfigFromDialog(dialog) Dim config As Object config = initRedactionConfiguration() - config.setPropertyValue("complexity", complexityLevel) + If dialog.getControl("CB_complexity").state = 1 Then + config.setPropertyValue("complexity", "makerUp") + Else + config.setPropertyValue("complexity", "user") + EndIf +End Sub + +Private Sub loadConfigToDialog(dialog) + Dim config As Object + config = initRedactionConfiguration() + If config.getPropertyValue("complexity") = "makerUp" Then + dialog.getControl("CB_complexity").state = 1 + Else + dialog.getControl("CB_complexity").state = 0 + EndIf + +End Sub + +Private Sub configurationDialog + Dim dialog As Object + DialogLibraries.LoadLibrary("Redaction") + dialog = CreateUnoDialog(DialogLibraries.Redaction.ConfigDialog) + loadConfigToDialog(dialog) + dialog.setVisible(true) + Select Case dialog.Execute() + Case 1 + setConfigFromDialog(dialog) + Case 0 + End Select + + dialog.setVisible(false) + dialog.dispose() + Exit sub + + End Sub \ No newline at end of file diff --git a/Redaction/dialog.xlb b/Redaction/dialog.xlb index 31106b9..074778b 100644 --- a/Redaction/dialog.xlb +++ b/Redaction/dialog.xlb @@ -1,3 +1,5 @@ - + + + \ No newline at end of file diff --git a/Redaction/script.xlb b/Redaction/script.xlb index e1daf7f..9cbed8d 100644 --- a/Redaction/script.xlb +++ b/Redaction/script.xlb @@ -4,4 +4,4 @@ - + \ No newline at end of file