Fixes in page config dialog

This commit is contained in:
Georgy Litvinov 2020-05-07 12:20:56 +02:00
parent 6572ca3b38
commit 1d7c37bf5d
6 changed files with 54 additions and 21 deletions

View file

@ -3,7 +3,7 @@
xmlns:dep="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
<identifier value="pro.litvinovg.epublishing" />
<version value="0.5.4" />
<version value="0.5.6" />
<platform value="all" />
<display-name>
<name lang="ru">Инструменты для создания электронных изданий</name>

View file

@ -2,28 +2,42 @@
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="PageConfig" dlg:left="102" dlg:top="13" dlg:width="386" dlg:height="316" dlg:closeable="true" dlg:moveable="true">
<dlg:styles>
<dlg:style dlg:style-id="0" dlg:border="none"/>
<dlg:style dlg:style-id="0" dlg:border="simple"/>
<dlg:style dlg:style-id="1" dlg:border="none"/>
</dlg:styles>
<dlg:bulletinboard>
<dlg:textfield dlg:style-id="0" dlg:id="pageHeight" dlg:tab-index="12" dlg:left="6" dlg:top="143" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="pageWidth" dlg:tab-index="8" dlg:left="98" dlg:top="301" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="leftPageMargin" dlg:tab-index="7" dlg:left="32" dlg:top="3" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="topPageMargin" dlg:tab-index="3" dlg:left="194" dlg:top="32" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="headerHeight" dlg:tab-index="4" dlg:left="194" dlg:top="46" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="headerOffset" dlg:tab-index="5" dlg:left="194" dlg:top="62" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="footerHeight" dlg:tab-index="10" dlg:left="194" dlg:top="261" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="footerOffset" dlg:tab-index="9" dlg:left="194" dlg:top="246" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="footnoteAreaHeight" dlg:tab-index="6" dlg:left="194" dlg:top="232" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="footnoteAreaOffset" dlg:tab-index="2" dlg:left="194" dlg:top="205" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:text dlg:id="description" dlg:tab-index="13" dlg:left="228" dlg:top="8" dlg:width="155" dlg:height="42" dlg:value="Label1" dlg:multiline="true"/>
<dlg:button dlg:id="Cancel" dlg:tab-index="15" dlg:left="313" dlg:top="292" dlg:width="60" dlg:height="13" dlg:value="Cancel" dlg:button-type="cancel"/>
<dlg:button dlg:id="Ok" dlg:tab-index="14" dlg:left="240" dlg:top="292" dlg:width="60" dlg:height="13" dlg:value="Ok" dlg:toggled="1">
<dlg:textfield dlg:style-id="0" dlg:id="pageHeight" dlg:tab-index="13" dlg:left="3" dlg:top="143" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="pageWidth" dlg:tab-index="9" dlg:left="108" dlg:top="301" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="leftPageMargin" dlg:tab-index="8" dlg:left="40" dlg:top="3" dlg:width="18" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="topPageMargin" dlg:tab-index="4" dlg:left="204" dlg:top="32" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="headerHeight" dlg:tab-index="5" dlg:left="204" dlg:top="46" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="headerOffset" dlg:tab-index="6" dlg:left="204" dlg:top="62" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="footerHeight" dlg:tab-index="11" dlg:left="204" dlg:top="261" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="footerOffset" dlg:tab-index="10" dlg:left="204" dlg:top="245" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="footnoteAreaHeight" dlg:tab-index="7" dlg:left="204" dlg:top="232" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="footnoteAreaOffset" dlg:tab-index="3" dlg:left="204" dlg:top="205" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:text dlg:id="description" dlg:tab-index="14" dlg:left="238" dlg:top="8" dlg:width="145" dlg:height="42" dlg:value="Label1" dlg:multiline="true"/>
<dlg:button dlg:id="Cancel" dlg:tab-index="16" dlg:left="313" dlg:top="292" dlg:width="60" dlg:height="13" dlg:value="Cancel" dlg:button-type="cancel"/>
<dlg:button dlg:id="Ok" dlg:tab-index="15" dlg:left="240" dlg:top="292" dlg:width="60" dlg:height="13" dlg:value="Ok" dlg:toggled="1">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ePublishing.PageStyles.applyPageStyleConfiguration?language=Basic&amp;location=application" script:language="Script"/>
</dlg:button>
<dlg:img dlg:style-id="0" dlg:id="ImageControl1" dlg:tab-index="17" dlg:left="10" dlg:top="10" dlg:width="214" dlg:height="291" dlg:scale-mode="isotropic"/>
<dlg:menulist dlg:style-id="0" dlg:id="pageStyles" dlg:tab-index="16" dlg:left="228" dlg:top="52" dlg:width="155" dlg:height="230" dlg:multiselection="true"/>
<dlg:textfield dlg:style-id="0" dlg:id="rightPageMargin" dlg:tab-index="1" dlg:left="167" dlg:top="3" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="bottomPageMargin" dlg:tab-index="11" dlg:left="194" dlg:top="280" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="textToLine" dlg:tab-index="0" dlg:left="194" dlg:top="189" dlg:width="16" dlg:height="10" dlg:value="1000"/>
<dlg:img dlg:style-id="1" dlg:id="ImageControl1" dlg:tab-index="30" dlg:left="21" dlg:top="10" dlg:width="214" dlg:height="291" dlg:scale-mode="isotropic" dlg:tabstop="true"/>
<dlg:menulist dlg:style-id="1" dlg:id="pageStyles" dlg:tab-index="17" dlg:left="238" dlg:top="52" dlg:width="145" dlg:height="230" dlg:multiselection="true"/>
<dlg:textfield dlg:style-id="0" dlg:id="rightPageMargin" dlg:tab-index="2" dlg:left="178" dlg:top="3" dlg:width="18" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="bottomPageMargin" dlg:tab-index="12" dlg:left="204" dlg:top="280" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:textfield dlg:style-id="0" dlg:id="textToLine" dlg:tab-index="1" dlg:left="204" dlg:top="189" dlg:width="16" dlg:height="10" dlg:valign="center" dlg:value="1000"/>
<dlg:text dlg:id="mm1" dlg:tab-index="0" dlg:left="20" dlg:top="143" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center" dlg:tabstop="true"/>
<dlg:text dlg:id="mm2" dlg:tab-index="29" dlg:left="58" dlg:top="3" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm3" dlg:tab-index="28" dlg:left="124" dlg:top="301" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm4" dlg:tab-index="27" dlg:left="220" dlg:top="32" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm5" dlg:tab-index="26" dlg:left="196" dlg:top="3" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm6" dlg:tab-index="25" dlg:left="220" dlg:top="46" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm7" dlg:tab-index="24" dlg:left="220" dlg:top="62" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm8" dlg:tab-index="23" dlg:left="220" dlg:top="280" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm9" dlg:tab-index="22" dlg:left="220" dlg:top="261" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm10" dlg:tab-index="21" dlg:left="220" dlg:top="232" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm11" dlg:tab-index="20" dlg:left="220" dlg:top="205" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm12" dlg:tab-index="19" dlg:left="220" dlg:top="189" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="mm13" dlg:tab-index="18" dlg:left="220" dlg:top="245" dlg:width="12" dlg:height="10" dlg:value="mm" dlg:align="center" dlg:valign="center"/>
</dlg:bulletinboard>
</dlg:window>

View file

@ -122,6 +122,19 @@ Sub setHelpText
pDialog.getControl(&quot;footnoteAreaHeight&quot;).Model.HelpText = getTranslation(&quot;PageConfigFootnoteAreaHeight&quot;)
pDialog.getControl(&quot;footnoteAreaOffset&quot;).Model.HelpText = getTranslation(&quot;PageConfigFootnoteAreaOffset&quot;)
pDialog.getControl(&quot;textToLine&quot;).Model.HelpText = getTranslation(&quot;PageConfigTextToLine&quot;)
pDialog.getControl(&quot;mm1&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm2&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm3&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm4&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm5&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm6&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm7&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm8&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm9&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm10&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm11&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm12&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
pDialog.getControl(&quot;mm13&quot;).setText(getTranslation(&quot;PageConfigMM&quot;))
End Sub

View file

@ -232,6 +232,9 @@ Function getRussian(identifier As String) As String
Case &quot;PageConfigTextToLine&quot;
getRussian = &quot;Отступ от текста до линии сноски&quot;
Exit Function
Case &quot;PageConfigMM&quot;
getRussian = &quot;мм&quot;
Exit Function
Case Else
getRussian = &quot;Перевод не найден&quot;
End Select
@ -456,6 +459,9 @@ Function getEnglish(identifier As String) As String
Case &quot;PageConfigTextToLine&quot;
getEnglish = &quot;Indent from text to footnote line&quot;
Exit Function
Case &quot;PageConfigMM&quot;
getEnglish = &quot;mm&quot;
Exit Function
Case Else
getEnglish = &quot;No translation&quot;
End Select

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="journals" script:language="StarBasic">Private sub journalsMark21
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="journals" script:language="StarBasic">Private sub journalsMark27
End sub
Dim templateName As String

Binary file not shown.