Fixed: Изменен текущий год в диалоге 'О программе'.

DikBSD · Feb 15, 2022 · 1fb6f4e · 1fb6f4e
1 parent 10c1e2a
commit 1fb6f4e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/oxt/OOoFBTools/AboutDlg.xdl b/oxt/OOoFBTools/AboutDlg.xdl
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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:style-id="8" dlg:id="AboutDlg" dlg:left="49" dlg:top="63" dlg:width="369" dlg:height="237" dlg:closeable="true" dlg:moveable="true" dlg:title="О пакете OooFBTools">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:style-id="6" dlg:id="AboutDlg" dlg:left="49" dlg:top="63" dlg:width="369" dlg:height="237" dlg:closeable="true" dlg:moveable="true" dlg:title="О пакете OooFBTools">
  <dlg:styles>
   <dlg:style dlg:style-id="0" dlg:text-color="0x0" dlg:font-height="14" dlg:font-weight="150"/>
   <dlg:style dlg:style-id="1" dlg:text-color="0x80" dlg:font-name="Times New Roman" dlg:font-height="11" dlg:font-stylename="Обычный" dlg:font-family="roman" dlg:font-weight="100"/>
   <dlg:style dlg:style-id="2" dlg:font-height="11" dlg:font-weight="150"/>
   <dlg:style dlg:style-id="3" dlg:font-height="10" dlg:font-weight="100"/>
-  <dlg:style dlg:style-id="4" dlg:text-color="0x800080" dlg:font-height="11" dlg:font-weight="150"/>
-  <dlg:style dlg:style-id="5" dlg:text-color="0xff0000" dlg:font-height="14" dlg:font-weight="150"/>
-  <dlg:style dlg:style-id="6" dlg:border="simple" dlg:font-height="9" dlg:font-weight="150"/>
-  <dlg:style dlg:style-id="7" dlg:font-height="9" dlg:font-weight="150"/>
-  <dlg:style dlg:style-id="8" dlg:background-color="0xd5d0e1"/>
+  <dlg:style dlg:style-id="4" dlg:text-color="0xff0000" dlg:font-height="14" dlg:font-weight="150"/>
+  <dlg:style dlg:style-id="5" dlg:border="simple" dlg:font-height="9" dlg:font-weight="150"/>
+  <dlg:style dlg:style-id="6" dlg:background-color="0xd5d0e1"/>
  </dlg:styles>
  <dlg:bulletinboard>
   <dlg:button dlg:id="cmdbtnAboutOK" dlg:tab-index="0" dlg:left="292" dlg:top="217" dlg:width="68" dlg:height="16" dlg:value="OK" dlg:button-type="ok"/>
@@ -19,9 +17,7 @@
   <dlg:text dlg:style-id="2" dlg:id="lblCopyright" dlg:tab-index="2" dlg:left="229" dlg:top="9" dlg:width="132" dlg:height="12" dlg:value="Copyright" dlg:align="right"/>
   <dlg:text dlg:style-id="2" dlg:id="lblLicense" dlg:tab-index="4" dlg:left="44" dlg:top="116" dlg:width="89" dlg:height="14" dlg:value="License" dlg:align="center"/>
   <dlg:text dlg:style-id="3" dlg:id="lblAuthors" dlg:tab-index="5" dlg:left="180" dlg:top="58" dlg:width="182" dlg:height="152" dlg:value="Authors" dlg:align="right"/>
-  <dlg:text dlg:style-id="4" dlg:id="lbDonate" dlg:tab-index="6" dlg:left="3" dlg:top="184" dlg:width="157" dlg:height="12" dlg:value="Donate: "/>
-  <dlg:text dlg:style-id="5" dlg:id="lblDownloadCaption" dlg:tab-index="7" dlg:left="6" dlg:top="72" dlg:width="163" dlg:height="12" dlg:value="Download"/>
-  <dlg:textfield dlg:style-id="6" dlg:id="tfDownload" dlg:tab-index="8" dlg:left="5" dlg:top="87" dlg:width="163" dlg:height="23" dlg:multiline="true" dlg:readonly="true"/>
-  <dlg:textfield dlg:style-id="7" dlg:id="tfDonate" dlg:tab-index="9" dlg:left="3" dlg:top="196" dlg:width="134" dlg:height="35" dlg:multiline="true" dlg:readonly="true"/>
+  <dlg:text dlg:style-id="4" dlg:id="lblDownloadCaption" dlg:tab-index="6" dlg:left="6" dlg:top="72" dlg:width="163" dlg:height="12" dlg:value="Download"/>
+  <dlg:textfield dlg:style-id="5" dlg:id="tfDownload" dlg:tab-index="7" dlg:left="5" dlg:top="87" dlg:width="163" dlg:height="23" dlg:multiline="true" dlg:readonly="true"/>
  </dlg:bulletinboard>
 </dlg:window>
diff --git a/oxt/OOoFBTools/Help.xba b/oxt/OOoFBTools/Help.xba
@@ -13,7 +13,7 @@ Sub About
 	With oAboutDlg.getModel
 		&apos;.ImageURL = getRootStorage( &quot;DikBSD.OOoFBTools&quot; ) &amp; &quot;/images/about-dlg.png&quot;
 		.lblName.Label = &quot;OOoFBTools-&quot; &amp; getMyVersion( &quot;DikBSD.OOoFBTools&quot; )
-		.lblCopyright.Label = &quot;Copyright © 2008-2021&quot;
+		.lblCopyright.Label = &quot;Copyright © 2008-2022&quot;
 		.lblDiscription.MultiLine	= 1
 		.lblAuthors.MultiLine		= 1
 		If getOOoLocal() = &quot;ru&quot; OR getOOoLocal() = &quot;uk&quot; Then
@@ -32,8 +32,6 @@ Sub About
 								&quot;Павел Крупин (PaulTheTortoise)&quot; &amp; chr(10) &amp; _
 								&quot;Дмитрий Габинский (перевод на английский)&quot; &amp; chr(10) &amp; _
 								&quot;Стариков Сергей (администратор https://sourceforge.net/p/fbtools)&quot;
-			.lbDonate.Label = &quot;Поощрение развития программы:&quot;
-			.tfDonate.Text = &quot;Яндекс.Деньги: 410011593533132&quot;  &amp; chr(10) &amp; &quot;WebMoney Рубли: R404893412668&quot; &amp; chr(10) &amp; &quot;WebMoney Доллары: Z167905663380&quot;
 			.lblDownloadCaption.Label = &quot;Скачать новые версии:&quot;
 			.tfDownload.Text = &quot;SourceForge.net: https://sourceforge.net/projects/fbtools/&quot;
 		Else
@@ -52,8 +50,6 @@ Sub About
 								&quot;Pavel Krupin (PaulTheTortoise)&quot; &amp; chr(10) &amp; _
 								&quot;Dmitri Gabinski (translation to english)&quot; &amp; chr(10) &amp; _
 								&quot;Starikov Sergey (administrator https://sourceforge.net/p/fbtools)&quot;
-			.lbDonate.Label = &quot;Donate:&quot;
-			.tfDonate.Text = &quot;Yandex Money: 410011593533132&quot;  &amp; chr(10) &amp; &quot;WebMoney Rub.: R404893412668&quot;  &amp; chr(10) &amp; &quot;WebMoney $: Z167905663380&quot;
 			.lblDownloadCaption.Label = &quot;Download new version:&quot;
 			.tfDownload.Text = &quot;SourceForge.net: https://sourceforge.net/projects/fbtools/&quot;
 		End If