break gültiger Adressat over many lines if needed

3 files changed, 96 insertions, 64 deletions

diff --git a/emails.lps b/emails.lps
index 23d4148..ecd60e8 100644
--- a/emails.lps
+++ b/emails.lps
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectSession>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <BuildModes Active="Default"/>
-    <Units Count="9">
+    <Units Count="10">
       <Unit0>
         <Filename Value="emails.lpr"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos Y="7"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="26"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
@@ -18,20 +18,19 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <IsVisibleTab Value="True"/>
-        <TopLine Value="71"/>
-        <CursorPos X="41" Y="101"/>
-        <UsageCount Value="25"/>
+        <TopLine Value="121"/>
+        <CursorPos X="23" Y="146"/>
+        <UsageCount Value="26"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../units/popunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="1"/>
-        <TopLine Value="600"/>
+        <EditorIndex Value="3"/>
+        <TopLine Value="196"/>
         <CursorPos X="54" Y="196"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="26"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
@@ -49,17 +48,20 @@
       </Unit4>
       <Unit5>
         <Filename Value="../units/mystringlistunit.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="25"/>
-        <CursorPos X="6" Y="47"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="593"/>
+        <CursorPos X="35" Y="618"/>
         <UsageCount Value="11"/>
+        <Loaded Value="True"/>
       </Unit5>
       <Unit6>
         <Filename Value="../units/lowlevelunit.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="77"/>
-        <CursorPos Y="99"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="616"/>
+        <CursorPos X="18" Y="669"/>
         <UsageCount Value="10"/>
+        <Loaded Value="True"/>
       </Unit6>
       <Unit7>
         <Filename Value="../units/gitupdateunit.pas"/>
@@ -74,122 +76,134 @@
         <CursorPos X="21" Y="70"/>
         <UsageCount Value="10"/>
       </Unit8>
+      <Unit9>
+        <Filename Value="/usr/lib/fpc/src/rtl/objpas/classes/classesh.inc"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="753"/>
+        <CursorPos X="20" Y="774"/>
+        <UsageCount Value="10"/>
+      </Unit9>
     </Units>
-    <JumpHistory Count="29" HistoryIndex="28">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="172" Column="46" TopLine="139"/>
+        <Caret Line="23" Column="23" TopLine="4"/>
       </Position1>
       <Position2>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="182" Column="44" TopLine="149"/>
+        <Caret Line="154" Column="42" TopLine="134"/>
       </Position2>
       <Position3>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="187" Column="21" TopLine="154"/>
+        <Caret Line="278" Column="39" TopLine="257"/>
       </Position3>
       <Position4>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="276" Column="44" TopLine="243"/>
+        <Caret Line="25" Column="25" TopLine="5"/>
       </Position4>
       <Position5>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="440" Column="38" TopLine="408"/>
+        <Caret Line="173" Column="32" TopLine="164"/>
       </Position5>
       <Position6>
         <Filename Value="../units/popunit.pas"/>
+        <Caret Line="23" Column="23" TopLine="23"/>
       </Position6>
       <Position7>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="56" Column="26" TopLine="25"/>
+        <Caret Line="56" Column="13" TopLine="29"/>
       </Position7>
       <Position8>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="445" Column="47" TopLine="410"/>
+        <Caret Line="22" Column="12" TopLine="2"/>
       </Position8>
       <Position9>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="518" Column="4" TopLine="498"/>
+        <Caret Line="162" Column="34" TopLine="129"/>
       </Position9>
       <Position10>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="520" TopLine="500"/>
+        <Caret Line="163" Column="10" TopLine="151"/>
       </Position10>
       <Position11>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="539" Column="17" TopLine="518"/>
+        <Caret Line="169" Column="10" TopLine="151"/>
       </Position11>
       <Position12>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="23" Column="23" TopLine="4"/>
+        <Caret Line="180" Column="21" TopLine="151"/>
       </Position12>
       <Position13>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="154" Column="42" TopLine="134"/>
+        <Caret Line="521" Column="52" TopLine="508"/>
       </Position13>
       <Position14>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="278" Column="39" TopLine="257"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="39" Column="5" TopLine="39"/>
       </Position14>
       <Position15>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="25" Column="25" TopLine="5"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="107" Column="11" TopLine="75"/>
       </Position15>
       <Position16>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="173" Column="32" TopLine="164"/>
+        <Filename Value="unit1.pas"/>
       </Position16>
       <Position17>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="23" Column="23" TopLine="23"/>
+        <Caret Line="159" Column="68" TopLine="139"/>
       </Position17>
       <Position18>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="56" Column="13" TopLine="29"/>
+        <Caret Line="29" Column="26" TopLine="9"/>
       </Position18>
       <Position19>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="22" Column="12" TopLine="2"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="101" TopLine="62"/>
       </Position19>
       <Position20>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="162" Column="34" TopLine="129"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="147" Column="105" TopLine="82"/>
       </Position20>
       <Position21>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="163" Column="10" TopLine="151"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="82" Column="24" TopLine="60"/>
       </Position21>
       <Position22>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="169" Column="10" TopLine="151"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="631" Column="47" TopLine="599"/>
       </Position22>
       <Position23>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="180" Column="21" TopLine="151"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="647" Column="12" TopLine="609"/>
       </Position23>
       <Position24>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="521" Column="52" TopLine="508"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="637" Column="30" TopLine="613"/>
       </Position24>
       <Position25>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="39" Column="5" TopLine="39"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="635" Column="51" TopLine="613"/>
       </Position25>
       <Position26>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="107" Column="11" TopLine="75"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="637" Column="51" TopLine="588"/>
       </Position26>
       <Position27>
-        <Filename Value="unit1.pas"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="83" Column="19" TopLine="61"/>
       </Position27>
       <Position28>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="159" Column="68" TopLine="139"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="647" Column="21" TopLine="612"/>
       </Position28>
       <Position29>
-        <Filename Value="../units/popunit.pas"/>
-        <Caret Line="29" Column="26" TopLine="9"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="146" Column="23" TopLine="121"/>
       </Position29>
+      <Position30>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="45" TopLine="7"/>
+      </Position30>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>
diff --git a/optionen.konf b/optionen.konf
index 71d911a..306565b 100644
--- a/optionen.konf
+++ b/optionen.konf
@@ -1,3 +1,14 @@
 aufploppen = NEIN
 Ton geben =  JA
-gültiger Adressat = .*@eckner\.net|(ee|intern|vorstand)@wurzel\.org|erich\.eckner@uni-jena\.de|erich\.eckner@gmx\.de|(ioq_(nlo|staff)|alle_mitarbeiter|fsr-physik-newsletter)@listserv\.uni-jena\.de|(sox-users|logwatch-devel)@lists\.sourceforge\.net|gmp-discuss@gmplib\.org|hashcash@freelists\.org|crux(-commits)?@lists\.crux\.nu|radvd-devel-l@lists\.litech\.org|arch-(general-request|ports)@archlinux\.org|users@httpd\.apache\.org
+gültiger Adressat = .*@eckner\.net
+gültiger Adressat = (ee|intern|vorstand)@wurzel\.org
+gültiger Adressat = erich\.eckner@uni-jena\.de
+gültiger Adressat = erich\.eckner@gmx\.de
+gültiger Adressat = (ioq_(nlo|staff)|alle_mitarbeiter|fsr-physik-newsletter)@listserv\.uni-jena\.de
+gültiger Adressat = (sox-users|logwatch-devel)@lists\.sourceforge\.net
+gültiger Adressat = gmp-discuss@gmplib\.org
+gültiger Adressat = hashcash@freelists\.org
+gültiger Adressat = crux(-commits)?@lists\.crux\.nu
+gültiger Adressat = radvd-devel-l@lists\.litech\.org
+gültiger Adressat = arch-(general-request|ports)@archlinux\.org
+gültiger Adressat = users@httpd\.apache\.org
diff --git a/unit1.pas b/unit1.pas
index 84ef36f..3730e0e 100644
--- a/unit1.pas
+++ b/unit1.pas
@@ -89,15 +89,22 @@ begin
     else if s<>'' then
       raise exception.create(''''+s+''' ist kein gültiger Wert für ''Ton geben'' (ja|nein)!');
 
-    s:=sl.grepFirst('^gültiger\s+Adressat\s*=');
-    if s<>'' then begin
-      erstesArgument(s,'=');
-      ga:=s;
+    sl.grep('^gültiger\s+Adressat\s*=');
+    if sl.count>0 then begin
+      ga:='';
+      sl.rewind;
+      while sl.readln(s) do begin
+        erstesArgument(s,'=');
+        ga:=ga+'|'+s;
+      end;
+      delete(ga,1,1);
     end;
 
     sl.free;
   end;
 
+  writeln(ga);
+
   pc:=tPopClient.create;
   pc.timeout:=10;
   pc.neueNachrichten:=@neueNachrichten;
@@ -136,7 +143,7 @@ begin
   else
     sl.add('Ton geben =  NEIN');
 
-  sl.add('gültiger Adressat = '+copy(pc.gueltigerAdressat,2,length(pc.gueltigerAdressat)-2));
+  sl.addWithLineBreaks('gültiger Adressat = '+umbrechen(copy(pc.gueltigerAdressat,2,length(pc.gueltigerAdressat)-2),'|',true,'gültiger Adressat = '));
 
   sl.saveToFile(extractfilepath(application.exename)+'optionen.konf');
   sl.free;