diff --git a/description.xml b/description.xml index e3677a3..7f1d2ce 100644 --- a/description.xml +++ b/description.xml @@ -3,7 +3,7 @@ xmlns:dep="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + Инструменты для создания электронных изданий diff --git a/ePublishing/PageStyles.xba b/ePublishing/PageStyles.xba index 5d99ca0..d31a479 100644 --- a/ePublishing/PageStyles.xba +++ b/ePublishing/PageStyles.xba @@ -25,6 +25,7 @@ Sub pageStylesDialog pDialog.getControl("ImageControl1").model.imageURL = imageURL pDialog.getControl("description").setText(getTranslation("PageConfigDialogTranslations")) cleanPageSettings() + setHelpText() pDialog.getControl("Cancel").Label = getTranslation("PageConfigDialogCancelButton") pDialog.getControl("Ok").Label = getTranslation("PageConfigDialogOkButton") listBox = pDialog.getControl("pageStyles") @@ -104,9 +105,25 @@ Sub cleanPageSettings() pDialog.getControl("footnoteAreaHeight").setText("") pDialog.getControl("footnoteAreaOffset").setText("") pDialog.getControl("textToLine").setText("") - 'Globalscope.BasicLibraries.LoadLibrary( "MRILib" ) End Sub +Sub setHelpText + pDialog.getControl("pageHeight").Model.HelpText = getTranslation("PageConfigPageHeight") + pDialog.getControl("pageWidth").Model.HelpText = getTranslation("PageConfigPageWidth") + pDialog.getControl("leftPageMargin").Model.HelpText = getTranslation("PageConfigLeftPageMargin") + pDialog.getControl("topPageMargin").Model.HelpText = getTranslation("PageConfigTopPageMargin") + pDialog.getControl("rightPageMargin").Model.HelpText = getTranslation("PageConfigRightPageMargin") + pDialog.getControl("bottomPageMargin").Model.HelpText = getTranslation("PageConfigBottomPageMargin") + pDialog.getControl("headerHeight").Model.HelpText = getTranslation("PageConfigHeaderHeight") + pDialog.getControl("headerOffset").Model.HelpText = getTranslation("PageConfigHeaderOffset") + pDialog.getControl("footerHeight").Model.HelpText = getTranslation("PageConfigFooterHeight") + pDialog.getControl("footerOffset").Model.HelpText = getTranslation("PageConfigFooterOffset") + pDialog.getControl("footnoteAreaHeight").Model.HelpText = getTranslation("PageConfigFootnoteAreaHeight") + pDialog.getControl("footnoteAreaOffset").Model.HelpText = getTranslation("PageConfigFootnoteAreaOffset") + pDialog.getControl("textToLine").Model.HelpText = getTranslation("PageConfigTextToLine") +End Sub + + Function noPageSettings() As Boolean Dim setting As String noPageSettings = true diff --git a/ePublishing/Translations.xba b/ePublishing/Translations.xba index a757b26..19c41cb 100644 --- a/ePublishing/Translations.xba +++ b/ePublishing/Translations.xba @@ -193,6 +193,45 @@ Function getRussian(identifier As String) As String Case "PageConfigSettingsApplied" getRussian = "Настройки применены" Exit Function + Case "PageConfigPageHeight" + getRussian = "Высота страницы" + Exit Function + Case "PageConfigPageWidth" + getRussian = "Ширина страницы" + Exit Function + Case "PageConfigLeftPageMargin" + getRussian = "Отступ слева" + Exit Function + Case "PageConfigTopPageMargin" + getRussian = "Отступ сверху" + Exit Function + Case "PageConfigRightPageMargin" + getRussian = "Отступ справа" + Exit Function + Case "PageConfigBottomPageMargin" + getRussian = "Отступ снизу" + Exit Function + Case "PageConfigHeaderHeight" + getRussian = "Высота верхнего колонтитула" + Exit Function + Case "PageConfigHeaderOffset" + getRussian = "Отступ от верхнего колонтитула до текста" + Exit Function + Case "PageConfigFooterHeight" + getRussian = "Высота нижнего колонтитула" + Exit Function + Case "PageConfigFooterOffset" + getRussian = "Отступ от сносок до нижнего колонтитула" + Exit Function + Case "PageConfigFootnoteAreaHeight" + getRussian = "Максимальная высота области сносок" + Exit Function + Case "PageConfigFootnoteAreaOffset" + getRussian = "Отступ от линии сноски до области сносок" + Exit Function + Case "PageConfigTextToLine" + getRussian = "Отступ от текста до линии сноски" + Exit Function Case Else getRussian = "Перевод не найден" End Select @@ -378,6 +417,45 @@ Function getEnglish(identifier As String) As String Case "PageConfigSettingsApplied" getEnglish = "Settings saved." Exit Function + Case "PageConfigPageHeight" + getEnglish = "Page height" + Exit Function + Case "PageConfigPageWidth" + getEnglish = "Page width" + Exit Function + Case "PageConfigLeftPageMargin" + getEnglish = "Left margin" + Exit Function + Case "PageConfigTopPageMargin" + getEnglish = "Top margin" + Exit Function + Case "PageConfigRightPageMargin" + getEnglish = "Rigth margin" + Exit Function + Case "PageConfigBottomPageMargin" + getEnglish = "Bottom margin" + Exit Function + Case "PageConfigHeaderHeight" + getEnglish = "Header height" + Exit Function + Case "PageConfigHeaderOffset" + getEnglish = "Indent from header to text body" + Exit Function + Case "PageConfigFooterHeight" + getEnglish = "Footer height" + Exit Function + Case "PageConfigFooterOffset" + getEnglish = "Indent from footnotes to footer" + Exit Function + Case "PageConfigFootnoteAreaHeight" + getEnglish = "Footnotes maximum height" + Exit Function + Case "PageConfigFootnoteAreaOffset" + getEnglish = "Indent from footnote line to footnote area" + Exit Function + Case "PageConfigTextToLine" + getEnglish = "Indent from text to footnote line" + Exit Function Case Else getEnglish = "No translation" End Select diff --git a/ePublishing/journals.xba b/ePublishing/journals.xba index 5e945f1..5b1dda1 100644 --- a/ePublishing/journals.xba +++ b/ePublishing/journals.xba @@ -1,6 +1,6 @@ -Private sub journalsMark19 +Private sub journalsMark20 End sub Dim templateName As String diff --git a/releasenotes.txt b/releasenotes.txt index 82e65e1..eeb8d22 100644 --- a/releasenotes.txt +++ b/releasenotes.txt @@ -1,3 +1,4 @@ +0.5.3 Help text to page styles dialog added 0.5.2 Page styles configuration dialog added 0.3.1 Icons improved 0.2.8 Release with fixed description diff --git a/translations.ods b/translations.ods index 662da4a..597e17a 100644 Binary files a/translations.ods and b/translations.ods differ