diff --git a/Redaction/Clean.xba b/Redaction/Clean.xba index d5b272a..71865b4 100644 --- a/Redaction/Clean.xba +++ b/Redaction/Clean.xba @@ -1,6 +1,6 @@ -Sub mark85 +Sub mark87 End Sub @@ -23,44 +23,45 @@ Sub cleanButton EndIf End Sub +Dim advancedCleaningDialog As Object + Private Sub makerUpMenu - Dim dialog As Object DialogLibraries.LoadLibrary("Redaction") - dialog = CreateUnoDialog(DialogLibraries.Redaction.CleaningDialog) - - dialog.getControl("fontsInStyles").Label = getTranslation("advancedMenuReplaceFontsInStyles") - dialog.getControl("symbolsConversion").Label = getTranslation("advancedMenuSymbolsConversion") - dialog.getControl("cleanFormatting").Label = getTranslation("advancedMenuCleanFormatting") - dialog.getControl("replaceWhiteBackground").Label = getTranslation("advancedMenuReplaceWhiteBackground") - dialog.getControl("removeUnusedStyles").Label = getTranslation("advancedMenuRemoveUnusedStyles") - dialog.getControl("removeLinks").Label = getTranslation("advancedMenuRemoveLinks") - dialog.getControl("removeAllFields").Label = getTranslation("advancedMenuRemoveAllFields") - dialog.getControl("removeBookmarks").Label = getTranslation("advancedMenuRemoveBookmarks") - dialog.getControl("configTables").Label = getTranslation("advancedMenuConfigTables") - dialog.getControl("configAnchors").Label = getTranslation("advancedMenuConfigAnchors") - dialog.getControl("fixMistakes").Label = getTranslation("advancedMenuFixMistakes") - dialog.getControl("fixDOI").Label = getTranslation("advancedMenuFixDOI") - dialog.getControl("replaceNumHyphen").Label = getTranslation("replaceNumHyphen") - dialog.getControl("removeInitPageBreak").Label = getTranslation("advancedMenuRemoveInitPageBreak") - dialog.getControl("removePageStyles").Label = getTranslation("advancedMenuRemovePageStyles") - dialog.getControl("loadStandardStyles").Label = getTranslation("advancedMenuLoadStandardStyles") - dialog.getControl("removeManualPageBreaks").Label = getTranslation("advancedMenuRemoveManualPageBreaks") - dialog.getControl("removeBasic").Label = getTranslation("advancedMenuRemoveBasic") - dialog.getControl("resetChapterNumberingRules").Label = getTranslation("advancedMenuResetChapterNumberingRules") - dialog.getControl("convertFontsToCharStyles").Label = getTranslation("advancedMenuconvertFontsToCharStyles") - dialog.getControl("fixBrokenCharBackTransparent").Label = getTranslation("fixBrokenCharBackTransparentMenuItem") - dialog.getControl("removeNotTransparentBackgrounds").Label = getTranslation("removeNotTransparentBackgrounds") - dialog.getControl("Cancel").Label = getTranslation("buttonCancel") - dialog.getControl("OK").Label = getTranslation("buttonOK") - dialog.getControl("buttonLoad").Label = getTranslation("buttonLoad") - dialog.Title = getTranslation("advancedMenuDialogTitle") - dialog.setVisible(true) - Select Case dialog.Execute() + advancedCleaningDialog = CreateUnoDialog(DialogLibraries.Redaction.CleaningDialog) + advancedCleaningDialog.getControl("fontsInStyles").Label = getTranslation("advancedMenuReplaceFontsInStyles") + advancedCleaningDialog.getControl("symbolsConversion").Label = getTranslation("advancedMenuSymbolsConversion") + advancedCleaningDialog.getControl("cleanFormatting").Label = getTranslation("advancedMenuCleanFormatting") + advancedCleaningDialog.getControl("replaceWhiteBackground").Label = getTranslation("advancedMenuReplaceWhiteBackground") + advancedCleaningDialog.getControl("removeUnusedStyles").Label = getTranslation("advancedMenuRemoveUnusedStyles") + advancedCleaningDialog.getControl("removeLinks").Label = getTranslation("advancedMenuRemoveLinks") + advancedCleaningDialog.getControl("removeAllFields").Label = getTranslation("advancedMenuRemoveAllFields") + advancedCleaningDialog.getControl("removeBookmarks").Label = getTranslation("advancedMenuRemoveBookmarks") + advancedCleaningDialog.getControl("configTables").Label = getTranslation("advancedMenuConfigTables") + advancedCleaningDialog.getControl("configAnchors").Label = getTranslation("advancedMenuConfigAnchors") + advancedCleaningDialog.getControl("fixMistakes").Label = getTranslation("advancedMenuFixMistakes") + advancedCleaningDialog.getControl("fixDOI").Label = getTranslation("advancedMenuFixDOI") + advancedCleaningDialog.getControl("replaceNumHyphen").Label = getTranslation("replaceNumHyphen") + advancedCleaningDialog.getControl("removeInitPageBreak").Label = getTranslation("advancedMenuRemoveInitPageBreak") + advancedCleaningDialog.getControl("removePageStyles").Label = getTranslation("advancedMenuRemovePageStyles") + advancedCleaningDialog.getControl("loadStandardStyles").Label = getTranslation("advancedMenuLoadStandardStyles") + advancedCleaningDialog.getControl("removeManualPageBreaks").Label = getTranslation("advancedMenuRemoveManualPageBreaks") + advancedCleaningDialog.getControl("removeBasic").Label = getTranslation("advancedMenuRemoveBasic") + advancedCleaningDialog.getControl("resetChapterNumberingRules").Label = getTranslation("advancedMenuResetChapterNumberingRules") + advancedCleaningDialog.getControl("convertFontsToCharStyles").Label = getTranslation("advancedMenuconvertFontsToCharStyles") + advancedCleaningDialog.getControl("fixBrokenCharBackTransparent").Label = getTranslation("fixBrokenCharBackTransparentMenuItem") + advancedCleaningDialog.getControl("removeNotTransparentBackgrounds").Label = getTranslation("removeNotTransparentBackgrounds") + advancedCleaningDialog.getControl("Cancel").Label = getTranslation("buttonCancel") + advancedCleaningDialog.getControl("OK").Label = getTranslation("buttonOK") + advancedCleaningDialog.getControl("buttonLoad").Label = getTranslation("buttonLoad") + advancedCleaningDialog.Title = getTranslation("advancedMenuDialogTitle") + setAdvancedDialogDescription() + advancedCleaningDialog.setVisible(true) + Select Case advancedCleaningDialog.Execute() Case 1 cleanAccordingTo(dialog) Case 0 End Select - dialog.dispose() + advancedCleaningDialog.dispose() Exit sub End Sub diff --git a/Redaction/CleaningDialog.xdl b/Redaction/CleaningDialog.xdl index 0b04908..317b762 100644 --- a/Redaction/CleaningDialog.xdl +++ b/Redaction/CleaningDialog.xdl @@ -1,10 +1,10 @@ - + - + - + @@ -20,7 +20,7 @@ - + @@ -30,5 +30,6 @@ + \ No newline at end of file diff --git a/Redaction/Configuration.xba b/Redaction/Configuration.xba index 5160b26..d913b2b 100644 --- a/Redaction/Configuration.xba +++ b/Redaction/Configuration.xba @@ -1,7 +1,7 @@ Public Const redactionExtensionName = "cleanAndValidate" -Public Const redactionExtensionVersion = "0.9.38" +Public Const redactionExtensionVersion = "0.10.0" Public Const template_name_monography = "Монография" Public Const template_name_pj = "Философский журнал" Public Const template_name_pq = "Вопросы философии" @@ -123,39 +123,81 @@ Private Sub configurationDialog Exit sub End Sub +Dim queitCleaningDialog As Object + Private Sub quietStartDialog - Dim dialog As Object DialogLibraries.LoadLibrary("Redaction") - dialog = CreateUnoDialog(DialogLibraries.Redaction.StartQuietCleaning) - Dim description As String + queitCleaningDialog = CreateUnoDialog(DialogLibraries.Redaction.StartQuietCleaning) + Dim buttonNameOk As String Dim buttonNameStop As String Dim buttonNameLoad As String Dim dialogTitle As String - description = getTranslation("startQuietCleaningDescription") buttonNameOk = getTranslation("buttonYes") buttonNameStop = getTranslation("buttonStop") buttonNameLoad = getTranslation("buttonLoad") dialogTitle = getTranslation("quietStartCleaningTitle") - dialog.Title = dialogTitle - dialog.getControl("Description").setText(description) - dialog.getControl("buttonOk").Label = buttonNameOk - dialog.getControl("buttonStop").Label = buttonNameStop - dialog.getControl("buttonLoad").Label = buttonNameLoad - dialog.setVisible(true) - Select Case dialog.Execute() + queitCleaningDialog.Title = dialogTitle + setQuietDialogDescription() + queitCleaningDialog.getControl("buttonOk").Label = buttonNameOk + queitCleaningDialog.getControl("buttonStop").Label = buttonNameStop + queitCleaningDialog.getControl("buttonLoad").Label = buttonNameLoad + queitCleaningDialog.setVisible(true) + Select Case queitCleaningDialog.Execute() Case 1 - dialog.setVisible(false) - dialog.dispose() + queitCleaningDialog.setVisible(false) + queitCleaningDialog.dispose() quietCleaning Case 0 - dialog.setVisible(false) - dialog.dispose() + queitCleaningDialog.setVisible(false) + queitCleaningDialog.dispose() End Select Exit sub End Sub +Function setAdvancedDialogDescription() + If IsNull(advancedCleaningDialog) Then + Exit Function + EndIf + Dim config As Object + Dim description As String + Dim predefined As String + Dim customFile As String + config = initRedactionConfiguration() + predefined = config.getPropertyValue("predefined_template") + customFile = config.getPropertyValue("defaultTemplate") + If predefined = "false" Then + description = getTranslation("templateNotSelected") + ElseIf predefined = template_manual Then + description = getTranslation("templateChosen") & " «" & customFile & "»" + Else + description = getTranslation("templateChosen") & " «" & predefined & "»" + EndIf + advancedCleaningDialog.getControl("description").setText(description) +End Function + +Function setQuietDialogDescription() + If IsNull(queitCleaningDialog) Then + Exit Function + EndIf + Dim config As Object + Dim description As String + Dim predefined As String + Dim customFile As String + config = initRedactionConfiguration() + predefined = config.getPropertyValue("predefined_template") + customFile = config.getPropertyValue("defaultTemplate") + If predefined = "false" Then + description = getTranslation("startQuietCleaningDescription1") & " " & getTranslation("startQuietCleaningDescription2") + ElseIf predefined = template_manual Then + description = getTranslation("startQuietCleaningDescription1") & " «" & customFile & "» " & getTranslation("startQuietCleaningDescription2") + Else + description = getTranslation("startQuietCleaningDescription1") & " «" & predefined & "» " & getTranslation("startQuietCleaningDescription2") + EndIf + queitCleaningDialog.getControl("Description").setText(description) +End Function + Dim styleFileDialog As Object Private Sub configureStyleFileDialog @@ -185,8 +227,11 @@ Private Sub configureStyleFileDialog Select Case styleFileDialog.Execute() Case 0 End Select + setQuietDialogDescription() + setAdvancedDialogDescription() styleFileDialog.setVisible(false) styleFileDialog.dispose() + End Sub diff --git a/Redaction/StartQuietCleaning.xdl b/Redaction/StartQuietCleaning.xdl index 8155db7..4be6a14 100644 --- a/Redaction/StartQuietCleaning.xdl +++ b/Redaction/StartQuietCleaning.xdl @@ -2,10 +2,10 @@ - - - - + + + + diff --git a/Redaction/Translations.xba b/Redaction/Translations.xba index 67930af..538d13e 100644 --- a/Redaction/Translations.xba +++ b/Redaction/Translations.xba @@ -29,8 +29,11 @@ Function getRussian(identifier As String) As String Case "noFileWithStylesFound" getRussian = "Файл-шаблон, содержащий стили для загрузки в документ не был задан. " & chr(10) &"Вы можете выбрать новый файл-шаблон. " & chr(10) & "Если файл-шаблон не будет выбран, то загрузка стилей из шаблона при чистке не будет выполняться." Exit Function - Case "startQuietCleaningDescription" - getRussian = "Вы хотите запустить чистку документа? " & chr(10) & "Здесь Вы можете также указать новый файл-шаблон." & chr(10) & "Стили из шаблона будут загружены в документ." + Case "startQuietCleaningDescription1" + getRussian = "Вы хотите запустить чистку документа? " & chr(10) & "Вы можете также указать новый файл-шаблон." & chr(10) & "Стили из шаблона " + Exit Function + Case "startQuietCleaningDescription2" + getRussian = "будут загружены в документ." Exit Function Case "buttonYes" getRussian = "Да" @@ -335,6 +338,12 @@ Function getRussian(identifier As String) As String Case "selectTemplateDialogTitle" getRussian = "Выберите шаблон из списка" Exit Function + Case "templateNotSelected" + getRussian = "Шаблон не выбран" + Exit Function + Case "templateChosen" + getRussian = "Выбран шаблон" + Exit Function Case Else getRussian = "Перевод не найден" End Select @@ -346,8 +355,11 @@ Function getEnglish(identifier As String) As String Case "noFileWithStylesFound" getEnglish = "Template with styles wasn't found. You can choose template on your computer." & chr(10) &" This stage of cleaning will be skipped if no file chosen." Exit Function - Case "startQuietCleaningDescription" - getEnglish = "Do you want to start document cleaning?" & chr(10) & "You can choose template with styles." & chr(10) & "Styles will be loaded in process of cleaning." & chr(10) & "" + Case "startQuietCleaningDescription1" + getEnglish = "Do you want to start document cleaning?" & chr(10) & "You can choose template with styles." & chr(10) & "Styles from template " + Exit Function + Case "startQuietCleaningDescription2" + getEnglish = "will be loaded in process of cleaning." & chr(10) & "" Exit Function Case "buttonYes" getEnglish = "Ok" @@ -652,6 +664,12 @@ Function getEnglish(identifier As String) As String Case "selectTemplateDialogTitle" getEnglish = "Select a template from the list " Exit Function + Case "templateNotSelected" + getEnglish = "Template not selected" + Exit Function + Case "templateChosen" + getEnglish = "Selected template" + Exit Function Case Else getEnglish = "No translation" End Select @@ -662,8 +680,11 @@ Function getCroatian(identifier As String) As String Case "noFileWithStylesFound" getCroatian = "Datoteka šablona koja sadrži stilove za učitavanje u dokument nije navedena. " & chr(10) &"Možete izabrati novi šablon na računaru. " & chr(10) & "Ako datoteka šablona nije izabrana, ovaj korak čišćenja će se preskočiti." Exit Function - Case "startQuietCleaningDescription" - getCroatian = "Da li želite da počnete sa čišćenjem dokumenta?" & chr(10) & "Ovde možete da odredite i novu datoteku šablona." & chr(10) & "Stilovi iz šablona biće učitani u dokument." + Case "startQuietCleaningDescription1" + getCroatian = "Da li želite da počnete sa čišćenjem dokumenta?" & chr(10) & "Ovde možete da odredite i novu datoteku šablona." & chr(10) & "Stilovi iz šablona " + Exit Function + Case "startQuietCleaningDescription2" + getCroatian = "biće učitani u dokument." Exit Function Case "buttonYes" getCroatian = "Da" @@ -968,6 +989,12 @@ Function getCroatian(identifier As String) As String Case "selectTemplateDialogTitle" getCroatian = "Izaberite obrazac sa liste" Exit Function + Case "templateNotSelected" + getCroatian = "Šablon nije izabran" + Exit Function + Case "templateChosen" + getCroatian = "Izabrani šablon" + Exit Function Case Else getCroatian = "No translation" End Select @@ -978,8 +1005,11 @@ Function getSerbian(identifier As String) As String Case "noFileWithStylesFound" getSerbian = "Датотека шаблона која садржи стилове за учитавање у документ није наведена." & chr(10) &"Можете изабрати нови šablon на рачунару. " & chr(10) & "Ако датотека шаблона није изабрана, овај корак чишћења ће се прескочити." Exit Function - Case "startQuietCleaningDescription" - getSerbian = "Да ли желите да почнете са чишћењем документа?" & chr(10) & "Овде можете да одредите и нову датотеку шаблона." & chr(10) & "Стилови из шаблона биће учитани у документ." + Case "startQuietCleaningDescription1" + getSerbian = "Да ли желите да почнете са чишћењем документа?" & chr(10) & "Овде можете да одредите и нову датотеку шаблона." & chr(10) & "Стилови из шаблона " + Exit Function + Case "startQuietCleaningDescription2" + getSerbian = "биће учитани у документ." Exit Function Case "buttonYes" getSerbian = "Да" @@ -1284,6 +1314,12 @@ Function getSerbian(identifier As String) As String Case "selectTemplateDialogTitle" getSerbian = "Изаберите образац са листе" Exit Function + Case "templateNotSelected" + getSerbian = "Шаблон није изабран" + Exit Function + Case "templateChosen" + getSerbian = "Изабрани шаблон" + Exit Function Case Else getSerbian = "No translation" End Select @@ -1294,8 +1330,11 @@ Function getBosnian(identifier As String) As String Case "noFileWithStylesFound" getBosnian = "Datoteka predloška koja sadrži stilove za učitavanje u dokument nije navedena." & chr(10) &" Na računaru možete odabrati novi predložak. " & chr(10) &"Ako datoteka predloška nije odabrana, ovaj korak čišćenja će se preskočiti." Exit Function - Case "startQuietCleaningDescription" - getBosnian = "Želite li započeti s čišćenjem dokumenta?" & chr(10) & "Ovdje možete odrediti i novu datoteku predloška." & chr(10) & "Stilovi iz predloška bit će učitani u dokument." + Case "startQuietCleaningDescription1" + getBosnian = "Želite li započeti s čišćenjem dokumenta?" & chr(10) & "Ovdje možete odrediti i novu datoteku predloška." & chr(10) & "Stilovi iz predloška" + Exit Function + Case "startQuietCleaningDescription2" + getBosnian = " bit će učitani u dokument." Exit Function Case "buttonYes" getBosnian = "Da" @@ -1600,6 +1639,12 @@ Function getBosnian(identifier As String) As String Case "selectTemplateDialogTitle" getBosnian = "Изаберите образац са листе" Exit Function + Case "templateNotSelected" + getBosnian = "Šablon nije izabran" + Exit Function + Case "templateChosen" + getBosnian = "Izabrani šablon" + Exit Function Case Else getBosnian = "No translation" End Select diff --git a/description.xml b/description.xml index cd68b33..177e347 100644 --- a/description.xml +++ b/description.xml @@ -11,7 +11,7 @@ - + @@ -186,13 +186,13 @@ - + - + diff --git a/gradle.properties b/gradle.properties index bc5a0b9..825e6cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=0.9.38 +version=0.10.0 diff --git a/translations.ods b/translations.ods index 847af8d..ac58eef 100644 Binary files a/translations.ods and b/translations.ods differ