Changeset 189


Ignore:
Timestamp:
May 16, 2019, 11:35:07 PM (6 years ago)
Author:
chronos
Message:
Location:
branches/generator
Files:
2 deleted
21 edited

Legend:

Unmodified
Added
Removed

  • branches/generator/Languages/generator.cs.po

    r137 r189  
    1111"Language: cs\n"
    1212"X-Generator: Poedit 2.0.4\n"
    13 
    14 #: tformgrammer.buttoncancel.caption
    15 msgctxt "tformgrammer.buttoncancel.caption"
    16 msgid "Cancel"
    17 msgstr "ZruÅ¡it"
    18 
    19 #: tformgrammer.buttonok.caption
    20 msgid "OK"
    21 msgstr "OK"
    22 
    23 #: tformgrammer.caption
    24 msgid "Grammer settings"
    25 msgstr "Nastavení gramatiky"
    26 
    27 #: tformgrammer.label1.caption
    28 msgid "Start rule:"
    29 msgstr "Počáteční pravidlo:"
    30 
    31 #: tformgrammer.label2.caption
    32 msgid "White space rule:"
    33 msgstr "Pravidlo bílÃœch znaků:"
    34 
    35 #: tformlookuptable.buttoncancel.caption
    36 msgctxt "tformlookuptable.buttoncancel.caption"
    37 msgid "Cancel"
    38 msgstr "ZruÅ¡it"
    39 
    40 #: tformlookuptable.buttonok.caption
    41 msgctxt "tformlookuptable.buttonok.caption"
    42 msgid "Ok"
    43 msgstr "Ok"
    44 
    45 #: tformlookuptable.caption
    46 msgid "Lookup table"
    47 msgstr "Hledací tabulka:"
    48 
    49 #: tformlookuptable.label1.caption
    50 msgctxt "tformlookuptable.label1.caption"
    51 msgid "Name:"
    52 msgstr "Jméno:"
    53 
    54 #: tformlookuptables.aadd.caption
    55 msgctxt "tformlookuptables.aadd.caption"
    56 msgid "Add"
    57 msgstr "Přidat"
    58 
    59 #: tformlookuptables.aadd.hint
    60 msgctxt "tformlookuptables.aadd.hint"
    61 msgid "Add"
    62 msgstr "Přidat"
    63 
    64 #: tformlookuptables.amodify.caption
    65 msgctxt "tformlookuptables.amodify.caption"
    66 msgid "Modify"
    67 msgstr "Upravit"
    68 
    69 #: tformlookuptables.amodify.hint
    70 msgctxt "tformlookuptables.amodify.hint"
    71 msgid "Modify"
    72 msgstr "Upravit"
    73 
    74 #: tformlookuptables.aremove.caption
    75 msgctxt "tformlookuptables.aremove.caption"
    76 msgid "Remove"
    77 msgstr "Odstranit"
    78 
    79 #: tformlookuptables.aremove.hint
    80 msgctxt "tformlookuptables.aremove.hint"
    81 msgid "Remove"
    82 msgstr "Odstranit"
    83 
    84 #: tformlookuptables.caption
    85 msgctxt "tformlookuptables.caption"
    86 msgid "Lookup tables"
    87 msgstr "Hledací tabulky:"
    88 
    89 #: tformlookuptables.listview1.columns[0].caption
    90 msgctxt "tformlookuptables.listview1.columns[0].caption"
    91 msgid "Name"
    92 msgstr "Název"
    9313
    9414#: tformmain.abuildcompiler.caption
    … …  
    201121msgstr "Pravidla"
    202122
    203 #: tformrule.buttoncancel.caption
    204 msgctxt "tformrule.buttoncancel.caption"
    205 msgid "Cancel"
    206 msgstr "ZruÅ¡it"
    207 
    208 #: tformrule.buttonok.caption
    209 msgctxt "tformrule.buttonok.caption"
    210 msgid "Ok"
    211 msgstr "Ok"
    212 
    213 #: tformrule.caption
    214 msgid "Rule"
    215 msgstr "Pravidlo"
    216 
    217 #: tformrule.checkboxcreatenode.caption
    218 msgid "Create source node"
    219 msgstr "Vytvářet zdrojovÃœ uzel"
    220 
    221 #: tformrule.label1.caption
    222 msgctxt "tformrule.label1.caption"
    223 msgid "Name:"
    224 msgstr "Jméno:"
    225 
    226 #: tformrule.label2.caption
    227 msgid "Level:"
    228 msgstr "Úroveň:"
    229 
    230 #: tformrule.listview1.columns[0].caption
    231 msgctxt "tformrule.listview1.columns[0].caption"
    232 msgid "Name"
    233 msgstr "Název"
    234 
    235 #: tformrule.tabsheet1.caption
    236 msgctxt "tformrule.tabsheet1.caption"
    237 msgid "Items"
    238 msgstr "PoloÅŸky"
    239 
    240 #: tformrule.tabsheet2.caption
    241 msgid "Links"
    242 msgstr "Vazby"
    243 
    244 #: tformrule.tabsheetusedby.caption
    245 msgid "Used by"
    246 msgstr "PouÅŸita čím"
    247 
    248 #: tformruleitem.buttoncancel.caption
    249 msgctxt "tformruleitem.buttoncancel.caption"
    250 msgid "Cancel"
    251 msgstr "ZruÅ¡it"
    252 
    253 #: tformruleitem.buttonok.caption
    254 msgctxt "tformruleitem.buttonok.caption"
    255 msgid "Ok"
    256 msgstr "Ok"
    257 
    258 #: tformruleitem.caption
    259 msgid "Rule item"
    260 msgstr "PoloÅŸka pravidla"
    261 
    262 #: tformruleitem.checkboxanyexcept.caption
    263 msgid "Any except"
    264 msgstr "VÅ¡e kromě"
    265 
    266 #: tformruleitem.checkboxescapedstring.caption
    267 msgctxt "tformruleitem.checkboxescapedstring.caption"
    268 msgid "Escaped strings"
    269 msgstr "PrefixovanÃœ znaky"
    270 
    271 #: tformruleitem.checkboxlookuptable.caption
    272 msgid "Use lookup table"
    273 msgstr "Pouşít hledací tabulku"
    274 
    275 #: tformruleitem.checkboxoptional.caption
    276 msgid "Optional"
    277 msgstr "VolitelnÃœ"
    278 
    279 #: tformruleitem.checkboxrepetitive.caption
    280 msgid "Repetitive"
    281 msgstr "OpakovanÃœ"
    282 
    283 #: tformruleitem.comboboxlookuptableaction.text
    284 msgid "Create"
    285 msgstr "Vytvořit"
    286 
    287 #: tformruleitem.label1.caption
    288 msgid "Item action:"
    289 msgstr "Akce poloÅŸky:"
    290 
    291 #: tformruleitem.label2.caption
    292 msgid "Type:"
    293 msgstr "Typ:"
    294 
    295 #: tformruleitem.labelnonterminal.caption
    296 msgid "Non-terminal:"
    297 msgstr "NekoncovÃœ:"
    298 
    299 #: tformruleitem.labelterminal.caption
    300 msgid "Terminal:"
    301 msgstr "KoncovÃœ:"
    302 
    303 #: tformruleitem.labelterminal1.caption
    304 msgid "Terminal from:"
    305 msgstr "KoncovÃœ od:"
    306 
    307 #: tformruleitem.labelterminal2.caption
    308 msgid "Terminal to:"
    309 msgstr "KoncovÃœ do:"
    310 
    311 #: tformruleitem.tabsheetnonterminal.caption
    312 msgid "NonTerminal"
    313 msgstr "NekoncovÃœ"
    314 
    315 #: tformruleitem.tabsheetsubitems.caption
    316 msgid "SubItems"
    317 msgstr "PodpoloÅŸky"
    318 
    319 #: tformruleitem.tabsheetterminal.caption
    320 msgid "Terminal"
    321 msgstr "KoncovÃœ"
    322 
    323 #: tformruleitem.tabsheetterminalrange.caption
    324 msgid "Terminal range"
    325 msgstr "NekoncovÃœ rozsah"
    326 
    327 #: tformruleitems.aadd.caption
    328 msgctxt "tformruleitems.aadd.caption"
    329 msgid "Add"
    330 msgstr "Přidat"
    331 
    332 #: tformruleitems.amodify.caption
    333 msgctxt "tformruleitems.amodify.caption"
    334 msgid "Modify"
    335 msgstr "Upravit"
    336 
    337 #: tformruleitems.amovedown.caption
    338 msgid "Move down"
    339 msgstr "Posunout dolů"
    340 
    341 #: tformruleitems.amoveup.caption
    342 msgid "Move up"
    343 msgstr "Posunout nahoru"
    344 
    345 #: tformruleitems.aremove.caption
    346 msgctxt "tformruleitems.aremove.caption"
    347 msgid "Remove"
    348 msgstr "Odstranit"
    349 
    350 #: tformruleitems.caption
    351 msgid "Rule items"
    352 msgstr "PoloÅŸky pravidla"
    353 
    354 #: tformruleitems.checkboxwhitespace.caption
    355 msgid "With white spaces"
    356 msgstr "S bílÃœmi znaky"
    357 
    358 #: tformruleitems.label1.caption
    359 msgid "Operator:"
    360 msgstr "Operátor:"
    361 
    362 #: tformruleitems.listview1.columns[0].caption
    363 msgctxt "tformruleitems.listview1.columns[0].caption"
    364 msgid "Name"
    365 msgstr "Název"
    366 
    367 #: tformrules.aadd.caption
    368 msgctxt "tformrules.aadd.caption"
    369 msgid "Add"
    370 msgstr "Přidat"
    371 
    372 #: tformrules.aadd.hint
    373 msgctxt "tformrules.aadd.hint"
    374 msgid "Add"
    375 msgstr "Přidat"
    376 
    377 #: tformrules.amodify.caption
    378 msgctxt "tformrules.amodify.caption"
    379 msgid "Modify"
    380 msgstr "Upravit"
    381 
    382 #: tformrules.amodify.hint
    383 msgctxt "tformrules.amodify.hint"
    384 msgid "Modify"
    385 msgstr "Upravit"
    386 
    387 #: tformrules.aremove.caption
    388 msgctxt "tformrules.aremove.caption"
    389 msgid "Remove"
    390 msgstr "Odstranit"
    391 
    392 #: tformrules.aremove.hint
    393 msgctxt "tformrules.aremove.hint"
    394 msgid "Remove"
    395 msgstr "Odstranit"
    396 
    397 #: tformrules.caption
    398 msgctxt "tformrules.caption"
    399 msgid "Rules"
    400 msgstr "Pravidla"
    401 
    402 #: tformrules.listview1.columns[0].caption
    403 msgctxt "tformrules.listview1.columns[0].caption"
    404 msgid "Name"
    405 msgstr "Název"
    406 
    407 #: tformrules.listview1.columns[1].caption
    408 msgid "Node"
    409 msgstr "Uzel"
    410 
    411 #: tformrules.listview1.columns[2].caption
    412 msgctxt "tformrules.listview1.columns[2].caption"
    413 msgid "Items"
    414 msgstr "PoloÅŸky"
    415 
    416 #: tformrules.listview1.columns[3].caption
    417 msgid "Char length"
    418 msgstr "Znaková délka"
    419 
    420 #: tformrules.listview1.columns[4].caption
    421 msgid "Level"
    422 msgstr "Úroveň"
    423 
    424123#: uformmain.sdoyouwanttosaveproject
    425124msgid "There are unsaved changes in project. Do you want to save them?"
    … …  
    433132msgid "Unsaved changes"
    434133msgstr "NeuloÅŸené změny"
     134

  • branches/generator/Languages/generator.po

    r137 r189  
    11msgid ""
    22msgstr "Content-Type: text/plain; charset=UTF-8"
    3 
    4 #: tformgrammer.buttoncancel.caption
    5 msgctxt "tformgrammer.buttoncancel.caption"
    6 msgid "Cancel"
    7 msgstr ""
    8 
    9 #: tformgrammer.buttonok.caption
    10 msgid "OK"
    11 msgstr ""
    12 
    13 #: tformgrammer.caption
    14 msgid "Grammer settings"
    15 msgstr ""
    16 
    17 #: tformgrammer.label1.caption
    18 msgid "Start rule:"
    19 msgstr ""
    20 
    21 #: tformgrammer.label2.caption
    22 msgid "White space rule:"
    23 msgstr ""
    24 
    25 #: tformlookuptable.buttoncancel.caption
    26 msgctxt "tformlookuptable.buttoncancel.caption"
    27 msgid "Cancel"
    28 msgstr ""
    29 
    30 #: tformlookuptable.buttonok.caption
    31 msgctxt "tformlookuptable.buttonok.caption"
    32 msgid "Ok"
    33 msgstr ""
    34 
    35 #: tformlookuptable.caption
    36 msgid "Lookup table"
    37 msgstr ""
    38 
    39 #: tformlookuptable.label1.caption
    40 msgctxt "tformlookuptable.label1.caption"
    41 msgid "Name:"
    42 msgstr ""
    43 
    44 #: tformlookuptables.aadd.caption
    45 msgctxt "tformlookuptables.aadd.caption"
    46 msgid "Add"
    47 msgstr ""
    48 
    49 #: tformlookuptables.aadd.hint
    50 msgctxt "tformlookuptables.aadd.hint"
    51 msgid "Add"
    52 msgstr ""
    53 
    54 #: tformlookuptables.amodify.caption
    55 msgctxt "tformlookuptables.amodify.caption"
    56 msgid "Modify"
    57 msgstr ""
    58 
    59 #: tformlookuptables.amodify.hint
    60 msgctxt "tformlookuptables.amodify.hint"
    61 msgid "Modify"
    62 msgstr ""
    63 
    64 #: tformlookuptables.aremove.caption
    65 msgctxt "tformlookuptables.aremove.caption"
    66 msgid "Remove"
    67 msgstr ""
    68 
    69 #: tformlookuptables.aremove.hint
    70 msgctxt "tformlookuptables.aremove.hint"
    71 msgid "Remove"
    72 msgstr ""
    73 
    74 #: tformlookuptables.caption
    75 msgctxt "tformlookuptables.caption"
    76 msgid "Lookup tables"
    77 msgstr ""
    78 
    79 #: tformlookuptables.listview1.columns[0].caption
    80 msgctxt "tformlookuptables.listview1.columns[0].caption"
    81 msgid "Name"
    82 msgstr ""
    833
    844#: tformmain.abuildcompiler.caption
    … …  
    191111msgstr ""
    192112
    193 #: tformrule.buttoncancel.caption
    194 msgctxt "tformrule.buttoncancel.caption"
    195 msgid "Cancel"
    196 msgstr ""
    197 
    198 #: tformrule.buttonok.caption
    199 msgctxt "tformrule.buttonok.caption"
    200 msgid "Ok"
    201 msgstr ""
    202 
    203 #: tformrule.caption
    204 msgid "Rule"
    205 msgstr ""
    206 
    207 #: tformrule.checkboxcreatenode.caption
    208 msgid "Create source node"
    209 msgstr ""
    210 
    211 #: tformrule.label1.caption
    212 msgctxt "tformrule.label1.caption"
    213 msgid "Name:"
    214 msgstr ""
    215 
    216 #: tformrule.label2.caption
    217 msgid "Level:"
    218 msgstr ""
    219 
    220 #: tformrule.listview1.columns[0].caption
    221 msgctxt "tformrule.listview1.columns[0].caption"
    222 msgid "Name"
    223 msgstr ""
    224 
    225 #: tformrule.tabsheet1.caption
    226 msgctxt "tformrule.tabsheet1.caption"
    227 msgid "Items"
    228 msgstr ""
    229 
    230 #: tformrule.tabsheet2.caption
    231 msgid "Links"
    232 msgstr ""
    233 
    234 #: tformrule.tabsheetusedby.caption
    235 msgid "Used by"
    236 msgstr ""
    237 
    238 #: tformruleitem.buttoncancel.caption
    239 msgctxt "tformruleitem.buttoncancel.caption"
    240 msgid "Cancel"
    241 msgstr ""
    242 
    243 #: tformruleitem.buttonok.caption
    244 msgctxt "tformruleitem.buttonok.caption"
    245 msgid "Ok"
    246 msgstr ""
    247 
    248 #: tformruleitem.caption
    249 msgid "Rule item"
    250 msgstr ""
    251 
    252 #: tformruleitem.checkboxanyexcept.caption
    253 msgid "Any except"
    254 msgstr ""
    255 
    256 #: tformruleitem.checkboxescapedstring.caption
    257 msgctxt "tformruleitem.checkboxescapedstring.caption"
    258 msgid "Escaped strings"
    259 msgstr ""
    260 
    261 #: tformruleitem.checkboxlookuptable.caption
    262 msgid "Use lookup table"
    263 msgstr ""
    264 
    265 #: tformruleitem.checkboxoptional.caption
    266 msgid "Optional"
    267 msgstr ""
    268 
    269 #: tformruleitem.checkboxrepetitive.caption
    270 msgid "Repetitive"
    271 msgstr ""
    272 
    273 #: tformruleitem.comboboxlookuptableaction.text
    274 msgid "Create"
    275 msgstr ""
    276 
    277 #: tformruleitem.label1.caption
    278 msgid "Item action:"
    279 msgstr ""
    280 
    281 #: tformruleitem.label2.caption
    282 msgid "Type:"
    283 msgstr ""
    284 
    285 #: tformruleitem.labelnonterminal.caption
    286 msgid "Non-terminal:"
    287 msgstr ""
    288 
    289 #: tformruleitem.labelterminal.caption
    290 msgid "Terminal:"
    291 msgstr ""
    292 
    293 #: tformruleitem.labelterminal1.caption
    294 msgid "Terminal from:"
    295 msgstr ""
    296 
    297 #: tformruleitem.labelterminal2.caption
    298 msgid "Terminal to:"
    299 msgstr ""
    300 
    301 #: tformruleitem.tabsheetnonterminal.caption
    302 msgid "NonTerminal"
    303 msgstr ""
    304 
    305 #: tformruleitem.tabsheetsubitems.caption
    306 msgid "SubItems"
    307 msgstr ""
    308 
    309 #: tformruleitem.tabsheetterminal.caption
    310 msgid "Terminal"
    311 msgstr ""
    312 
    313 #: tformruleitem.tabsheetterminalrange.caption
    314 msgid "Terminal range"
    315 msgstr ""
    316 
    317 #: tformruleitems.aadd.caption
    318 msgctxt "TFORMRULEITEMS.AADD.CAPTION"
    319 msgid "Add"
    320 msgstr ""
    321 
    322 #: tformruleitems.amodify.caption
    323 msgctxt "TFORMRULEITEMS.AMODIFY.CAPTION"
    324 msgid "Modify"
    325 msgstr ""
    326 
    327 #: tformruleitems.amovedown.caption
    328 msgid "Move down"
    329 msgstr ""
    330 
    331 #: tformruleitems.amoveup.caption
    332 msgid "Move up"
    333 msgstr ""
    334 
    335 #: tformruleitems.aremove.caption
    336 msgctxt "TFORMRULEITEMS.AREMOVE.CAPTION"
    337 msgid "Remove"
    338 msgstr ""
    339 
    340 #: tformruleitems.caption
    341 msgid "Rule items"
    342 msgstr ""
    343 
    344 #: tformruleitems.checkboxwhitespace.caption
    345 msgid "With white spaces"
    346 msgstr ""
    347 
    348 #: tformruleitems.label1.caption
    349 msgid "Operator:"
    350 msgstr ""
    351 
    352 #: tformruleitems.listview1.columns[0].caption
    353 msgctxt "TFORMRULEITEMS.LISTVIEW1.COLUMNS[0].CAPTION"
    354 msgid "Name"
    355 msgstr ""
    356 
    357 #: tformrules.aadd.caption
    358 msgctxt "tformrules.aadd.caption"
    359 msgid "Add"
    360 msgstr ""
    361 
    362 #: tformrules.aadd.hint
    363 msgctxt "TFORMRULES.AADD.HINT"
    364 msgid "Add"
    365 msgstr ""
    366 
    367 #: tformrules.amodify.caption
    368 msgctxt "tformrules.amodify.caption"
    369 msgid "Modify"
    370 msgstr ""
    371 
    372 #: tformrules.amodify.hint
    373 msgctxt "TFORMRULES.AMODIFY.HINT"
    374 msgid "Modify"
    375 msgstr ""
    376 
    377 #: tformrules.aremove.caption
    378 msgctxt "tformrules.aremove.caption"
    379 msgid "Remove"
    380 msgstr ""
    381 
    382 #: tformrules.aremove.hint
    383 msgctxt "TFORMRULES.AREMOVE.HINT"
    384 msgid "Remove"
    385 msgstr ""
    386 
    387 #: tformrules.caption
    388 msgctxt "TFORMRULES.CAPTION"
    389 msgid "Rules"
    390 msgstr ""
    391 
    392 #: tformrules.listview1.columns[0].caption
    393 msgctxt "tformrules.listview1.columns[0].caption"
    394 msgid "Name"
    395 msgstr ""
    396 
    397 #: tformrules.listview1.columns[1].caption
    398 msgid "Node"
    399 msgstr ""
    400 
    401 #: tformrules.listview1.columns[2].caption
    402 msgctxt "tformrules.listview1.columns[2].caption"
    403 msgid "Items"
    404 msgstr ""
    405 
    406 #: tformrules.listview1.columns[3].caption
    407 msgid "Char length"
    408 msgstr ""
    409 
    410 #: tformrules.listview1.columns[4].caption
    411 msgid "Level"
    412 msgstr ""
    413 
    414113#: uformmain.sdoyouwanttosaveproject
    415114msgid "There are unsaved changes in project. Do you want to save them?"

  • branches/generator/Packages/Common/Common.lpk

    r167 r189  
    6060      <Item5>
    6161        <Filename Value="UPrefixMultiplier.pas"/>
     62        <HasRegisterProc Value="True"/>
    6263        <UnitName Value="UPrefixMultiplier"/>
    6364      </Item5>
    … …  
    144145      <EnableI18NForLFM Value="True"/>
    145146    </i18n>
    146     <RequiredPkgs Count="3">
     147    <RequiredPkgs Count="2">
    147148      <Item1>
    148149        <PackageName Value="LCL"/>
    149150      </Item1>
    150151      <Item2>
    151         <PackageName Value="TemplateGenerics"/>
    152       </Item2>
    153       <Item3>
    154152        <PackageName Value="FCL"/>
    155153        <MinVersion Major="1" Valid="True"/>
    156       </Item3>
     154      </Item2>
    157155    </RequiredPkgs>
    158156    <UsageOptions>

  • branches/generator/Packages/Common/Common.pas

    r167 r189  
    2020begin
    2121  RegisterUnit('UDebugLog', @UDebugLog.Register);
     22  RegisterUnit('UPrefixMultiplier', @UPrefixMultiplier.Register);
    2223  RegisterUnit('ULastOpenedList', @ULastOpenedList.Register);
    2324  RegisterUnit('UJobProgressView', @UJobProgressView.Register);

  • branches/generator/Packages/Common/Languages/UJobProgressView.cs.po

    r167 r189  
    2424msgstr "Dokončené"
    2525
    26 #: ujobprogressview.soperations
    27 #, fuzzy
    28 #| msgid "Operations"
    29 msgid "Operations:"
    30 msgstr "Operace"
    31 
    3226#: ujobprogressview.spleasewait
    3327msgid "Please wait..."

  • branches/generator/Packages/Common/Languages/UJobProgressView.po

    r167 r189  
    1414msgstr ""
    1515
    16 #: ujobprogressview.soperations
    17 msgid "Operations:"
    18 msgstr ""
    19 
    2016#: ujobprogressview.spleasewait
    2117msgid "Please wait..."

  • branches/generator/Packages/Common/Languages/UThreading.po

    r114 r189  
    33
    44#: uthreading.scurrentthreadnotfound
     5#, fuzzy,badformat
    56msgid "Current thread ID %d not found in virtual thread list."
    67msgstr "Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8"

  • branches/generator/Packages/Common/UCommon.pas

    r167 r189  
    2828    unfDNSDomainName = 11);
    2929
    30   TFilterMethodMethod = function (FileName: string): Boolean of object;
     30  TFilterMethod = function (FileName: string): Boolean of object;
     31  TFileNameMethod = procedure (FileName: string) of object;
     32
    3133var
    3234  ExceptionHandler: TExceptionEvent;
    … …  
    7274function MergeArray(A, B: array of string): TArrayOfString;
    7375function LoadFileToStr(const FileName: TFileName): AnsiString;
     76procedure SaveStringToFile(S, FileName: string);
    7477procedure SearchFiles(AList: TStrings; Dir: string;
    75   FilterMethod: TFilterMethodMethod = nil);
     78  FilterMethod: TFilterMethod = nil; FileNameMethod: TFileNameMethod = nil);
    7679function GetStringPart(var Text: string; Separator: string): string;
     80function StripTags(const S: string): string;
    7781function PosFromIndex(SubStr: string; Text: string;
    7882  StartIndex: Integer): Integer;
    7983function PosFromIndexReverse(SubStr: string; Text: string;
    8084  StartIndex: Integer): Integer;
     85procedure CopyStringArray(Dest: TStringArray; Source: array of string);
    8186
    8287
    … …  
    106111  I: Integer;
    107112begin
     113  Result := '';
    108114  for I := 1 to Length(Source) do begin
    109115    Result := Result + LowerCase(IntToHex(Ord(Source[I]), 2));
    … …  
    527533end;
    528534
     535procedure SaveStringToFile(S, FileName: string);
     536var
     537  F: TextFile;
     538begin
     539  AssignFile(F, FileName);
     540  try
     541    ReWrite(F);
     542    Write(F, S);
     543  finally
     544    CloseFile(F);
     545  end;
     546end;
     547
    529548procedure SearchFiles(AList: TStrings; Dir: string;
    530   FilterMethod: TFilterMethodMethod = nil);
     549  FilterMethod: TFilterMethod = nil; FileNameMethod: TFileNameMethod = nil);
    531550var
    532551  SR: TSearchRec;
    … …  
    538557        if (SR.Name = '.') or (SR.Name = '..') or (Assigned(FilterMethod) and (not FilterMethod(SR.Name) or
    539558          not FilterMethod(Copy(Dir, 3, Length(Dir)) + SR.Name))) then Continue;
     559        if Assigned(FileNameMethod) then
     560          FileNameMethod(Dir + SR.Name);
    540561        AList.Add(Dir + SR.Name);
    541562        if (SR.Attr and faDirectory) <> 0 then
    … …  
    561582  Result := Trim(Result);
    562583  Text := Trim(Text);
     584end;
     585
     586function StripTags(const S: string): string;
     587var
     588  Len: Integer;
     589
     590  function ReadUntil(const ReadFrom: Integer; const C: Char): Integer;
     591  var
     592    J: Integer;
     593  begin
     594    for J := ReadFrom to Len do
     595      if (S[j] = C) then
     596      begin
     597        Result := J;
     598        Exit;
     599      end;
     600    Result := Len + 1;
     601  end;
     602
     603var
     604  I, APos: Integer;
     605begin
     606  Len := Length(S);
     607  I := 0;
     608  Result := '';
     609  while (I <= Len) do begin
     610    Inc(I);
     611    APos := ReadUntil(I, '<');
     612    Result := Result + Copy(S, I, APos - i);
     613    I := ReadUntil(APos + 1, '>');
     614  end;
    563615end;
    564616
    … …  
    608660end;
    609661
     662procedure CopyStringArray(Dest: TStringArray; Source: array of string);
     663var
     664  I: Integer;
     665begin
     666  SetLength(Dest, Length(Source));
     667  for I := 0 to Length(Dest) - 1 do
     668    Dest[I] := Source[I];
     669end;
     670
     671
    610672initialization
    611673

  • branches/generator/Packages/Common/UDebugLog.pas

    r167 r189  
    66
    77uses
    8   Classes, SysUtils, FileUtil, SpecializedList, SyncObjs;
     8  Classes, SysUtils, FileUtil, fgl, SyncObjs;
    99
    1010type
    … …  
    2929    procedure SetMaxCount(const AValue: Integer);
    3030  public
    31     Items: TListObject;
     31    Items: TFPGObjectList<TDebugLogItem>;
    3232    Lock: TCriticalSection;
    3333    procedure Add(Text: string; Group: string = '');
    … …  
    117117begin
    118118  inherited;
    119   Items := TListObject.Create;
     119  Items := TFPGObjectList<TDebugLogItem>.Create;
    120120  Lock := TCriticalSection.Create;
    121121  MaxCount := 100;

  • branches/generator/Packages/Common/UJobProgressView.lfm

    r167 r189  
    1515  OnShow = FormShow
    1616  Position = poScreenCenter
    17   LCLVersion = '1.8.2.0'
     17  LCLVersion = '2.0.2.0'
    1818  object PanelOperationsTitle: TPanel
    1919    Left = 0
    … …  
    241241    Interval = 100
    242242    OnTimer = TimerUpdateTimer
    243     left = 264
     243    left = 320
    244244    top = 8
    245245  end

  • branches/generator/Packages/Common/UJobProgressView.pas

    r167 r189  
    175175  STotalEstimatedTime = 'Total estimated time: %s';
    176176  SFinished = 'Finished';
    177   SOperations = 'Operations:';
    178177
    179178procedure Register;

  • branches/generator/Packages/Common/UListViewSort.pas

    r167 r189  
    99uses
    1010  {$IFDEF Windows}Windows, CommCtrl, {$ENDIF}Classes, Graphics, ComCtrls, SysUtils,
    11   Controls, DateUtils, Dialogs, SpecializedList, Forms, Grids, StdCtrls, ExtCtrls,
    12   LclIntf, LMessages, LclType, LResources;
     11  Controls, DateUtils, Dialogs, fgl, Forms, Grids, StdCtrls, ExtCtrls,
     12  LclIntf, LclType, LResources;
    1313
    1414type
    … …  
    5252    {$ENDIF}
    5353  public
    54     List: TListObject;
    55     Source: TListObject;
     54    List: TFPGObjectList<TObject>;
     55    Source: TFPGObjectList<TObject>;
    5656    constructor Create(AOwner: TComponent); override;
    5757    destructor Destroy; override;
    … …  
    9898  end;
    9999
     100  { TListViewEx }
     101
     102  TListViewEx = class(TWinControl)
     103  private
     104    FFilter: TListViewFilter;
     105    FListView: TListView;
     106    FListViewSort: TListViewSort;
     107    procedure ResizeHanlder;
     108  public
     109    constructor Create(TheOwner: TComponent); override;
     110    destructor Destroy; override;
     111  published
     112    property ListView: TListView read FListView write FListView;
     113    property ListViewSort: TListViewSort read FListViewSort write FListViewSort;
     114    property Filter: TListViewFilter read FFilter write FFilter;
     115    property Visible;
     116  end;
     117
    100118procedure Register;
    101119
    … …  
    105123procedure Register;
    106124begin
    107   RegisterComponents('Common', [TListViewSort, TListViewFilter]);
     125  RegisterComponents('Common', [TListViewSort, TListViewFilter, TListViewEx]);
     126end;
     127
     128{ TListViewEx }
     129
     130procedure TListViewEx.ResizeHanlder;
     131begin
     132end;
     133
     134constructor TListViewEx.Create(TheOwner: TComponent);
     135begin
     136  inherited Create(TheOwner);
     137  Filter := TListViewFilter.Create(Self);
     138  Filter.Parent := Self;
     139  Filter.Align := alBottom;
     140  ListView := TListView.Create(Self);
     141  ListView.Parent := Self;
     142  ListView.Align := alClient;
     143  ListViewSort := TListViewSort.Create(Self);
     144  ListViewSort.ListView := ListView;
     145end;
     146
     147destructor TListViewEx.Destroy;
     148begin
     149  inherited Destroy;
    108150end;
    109151
    … …  
    277319end;
    278320
     321var
     322  ListViewSortCompare: TCompareEvent;
     323
     324function ListViewCompare(const Item1, Item2: TObject): Integer;
     325begin
     326  Result := ListViewSortCompare(Item1, Item2);
     327end;
     328
    279329procedure TListViewSort.Sort(Compare: TCompareEvent);
    280330begin
     331  // TODO: Because TFLGObjectList compare handler is not class method,
     332  // it is necessary to use simple function compare handler with local variable
     333  ListViewSortCompare := Compare;
    281334  if (List.Count > 0) then
    282     List.Sort(Compare);
     335    List.Sort(ListViewCompare);
    283336end;
    284337
    … …  
    343396begin
    344397  inherited;
    345   List := TListObject.Create;
    346   List.OwnsObjects := False;
     398  List := TFPGObjectList<TObject>.Create;
     399  List.FreeObjects := False;
    347400end;
    348401

  • branches/generator/Packages/Common/UMemory.pas

    r167 r189  
    112112procedure TMemory.WriteMemory(Position: Integer; Memory: TMemory);
    113113begin
    114   Move(Memory.FData, PByte(@FData + Position)^, Memory.Size);
     114  Move(Memory.FData, PByte(PByte(@FData) + Position)^, Memory.Size);
    115115end;
    116116
    117117procedure TMemory.ReadMemory(Position: Integer; Memory: TMemory);
    118118begin
    119   Move(PByte(@FData + Position)^, Memory.FData, Memory.Size);
     119  Move(PByte(PByte(@FData) + Position)^, Memory.FData, Memory.Size);
    120120end;
    121121

  • branches/generator/Packages/Common/UPool.pas

    r114 r189  
    66
    77uses
    8   Classes, SysUtils, syncobjs, SpecializedList, UThreading;
     8  Classes, SysUtils, syncobjs, fgl, UThreading;
    99
    1010type
    … …  
    2222    function NewItemObject: TObject; virtual;
    2323  public
    24     Items: TListObject;
    25     FreeItems: TListObject;
     24    Items: TFPGObjectList<TObject>;
     25    FreeItems: TFPGObjectList<TObject>;
    2626    function Acquire: TObject; virtual;
    2727    procedure Release(Item: TObject); virtual;
    … …  
    185185begin
    186186  inherited;
    187   Items := TListObject.Create;
    188   FreeItems := TListObject.Create;
    189   FreeItems.OwnsObjects := False;
     187  Items := TFPGObjectList<TObject>.Create;
     188  FreeItems := TFPGObjectList<TObject>.Create;
     189  FreeItems.FreeObjects := False;
    190190  FReleaseEvent := TEvent.Create(nil, False, False, '');
    191191end;

  • branches/generator/Packages/Common/UPrefixMultiplier.pas

    r114 r189  
    2121  { TPrefixMultiplier }
    2222
    23   TPrefixMultiplier = class
     23  TPrefixMultiplier = class(TComponent)
    2424  private
    25     function TruncateDigits(Value:Double;Digits:Integer=3):Double;
     25    function TruncateDigits(Value: Double; Digits: Integer = 3): Double;
    2626  public
    2727    function Add(Value: Double; PrefixMultipliers: TPrefixMultiplierDef;
    … …  
    7272  );
    7373
     74procedure Register;
     75
     76
    7477implementation
     78
     79procedure Register;
     80begin
     81  RegisterComponents('Common', [TPrefixMultiplier]);
     82end;
    7583
    7684{ TPrefixMultiplier }
    … …  
    92100end;
    93101
    94 function TPrefixMultiplier.Add(Value:Double;PrefixMultipliers:TPrefixMultiplierDef
    95   ;UnitText:string;Digits:Integer):string;
     102function TPrefixMultiplier.Add(Value: Double; PrefixMultipliers: TPrefixMultiplierDef
     103  ; UnitText:string; Digits: Integer): string;
    96104var
    97105  I: Integer;

  • branches/generator/Packages/Common/URegistry.pas

    r167 r189  
    2929    procedure SetCurrentContext(AValue: TRegistryContext);
    3030  public
     31    function ReadChar(const Name: string): Char;
     32    procedure WriteChar(const Name: string; Value: Char);
    3133    function ReadBoolWithDefault(const Name: string;
    3234      DefaultValue: Boolean): Boolean;
    3335    function ReadIntegerWithDefault(const Name: string; DefaultValue: Integer): Integer;
    3436    function ReadStringWithDefault(const Name: string; DefaultValue: string): string;
     37    function ReadCharWithDefault(const Name: string; DefaultValue: Char): Char;
    3538    function ReadFloatWithDefault(const Name: string;
    3639      DefaultValue: Double): Double;
    … …  
    8992end;
    9093
     94function TRegistryEx.ReadCharWithDefault(const Name: string; DefaultValue: Char
     95  ): Char;
     96begin
     97  if ValueExists(Name) then Result := ReadChar(Name)
     98    else begin
     99      WriteChar(Name, DefaultValue);
     100      Result := DefaultValue;
     101    end;
     102end;
     103
    91104function TRegistryEx.ReadFloatWithDefault(const Name: string;
    92105  DefaultValue: Double): Double;
    … …  
    137150end;
    138151
     152function TRegistryEx.ReadChar(const Name: string): Char;
     153var
     154  S: string;
     155begin
     156  S := ReadString(Name);
     157  if Length(S) > 0 then Result := S[1]
     158    else Result := #0;
     159end;
     160
     161procedure TRegistryEx.WriteChar(const Name: string; Value: Char);
     162begin
     163  WriteString(Name, Value);
     164end;
     165
    139166function TRegistryEx.ReadBoolWithDefault(const Name: string;
    140167  DefaultValue: Boolean): Boolean;

  • branches/generator/Packages/Common/UScaleDPI.pas

    r167 r189  
    289289  //OldAutoSize: Boolean;
    290290begin
     291  //if not (Control is TCustomPage) then
     292  // Resize childs first
     293  if Control is TWinControl then begin
     294    WinControl := TWinControl(Control);
     295    if WinControl.ControlCount > 0 then begin
     296      for I := 0 to WinControl.ControlCount - 1 do begin
     297        if WinControl.Controls[I] is TControl then begin
     298          ScaleControl(WinControl.Controls[I], FromDPI);
     299        end;
     300      end;
     301    end;
     302  end;
     303
    291304  //if Control is TMemo then Exit;
    292305  //if Control is TForm then
    … …  
    340353  end;
    341354
    342   //if not (Control is TCustomPage) then
    343   if Control is TWinControl then begin
    344     WinControl := TWinControl(Control);
    345     if WinControl.ControlCount > 0 then begin
    346       for I := 0 to WinControl.ControlCount - 1 do begin
    347         if WinControl.Controls[I] is TControl then begin
    348           ScaleControl(WinControl.Controls[I], FromDPI);
    349         end;
    350       end;
    351     end;
    352   end;
    353355  //if Control is TForm then
    354356  //  Control.EnableAutoSizing;

  • branches/generator/Packages/Common/UXMLUtils.pas

    r167 r189  
    77uses
    88  {$IFDEF WINDOWS}Windows,{$ENDIF}
    9   Classes, SysUtils, DateUtils, DOM, XMLRead;
     9  Classes, SysUtils, DateUtils, DOM, xmlread;
    1010
    1111function XMLTimeToDateTime(XMLDateTime: string): TDateTime;

  • branches/generator/generator.lpi

    r167 r189  
    22<CONFIG>
    33  <ProjectOptions>
    4     <Version Value="10"/>
     4    <Version Value="11"/>
    55    <General>
    66      <SessionStorage Value="InProjectDir"/>
    77      <MainUnit Value="0"/>
    88      <Title Value="Language generator"/>
     9      <Scaled Value="True"/>
    910      <ResourceType Value="res"/>
    1011      <UseXPManifest Value="True"/>
     12      <XPManifest>
     13        <DpiAware Value="True"/>
     14      </XPManifest>
    1115      <Icon Value="0"/>
    1216    </General>
    … …  
    6569    </PublishOptions>
    6670    <RunParams>
    67       <local>
    68         <FormatVersion Value="1"/>
    69       </local>
     71      <FormatVersion Value="2"/>
     72      <Modes Count="1">
     73        <Mode0 Name="default"/>
     74      </Modes>
    7075    </RunParams>
    71     <RequiredPackages Count="4">
     76    <RequiredPackages Count="3">
    7277      <Item1>
    7378        <PackageName Value="FCL"/>
    7479      </Item1>
    7580      <Item2>
    76         <PackageName Value="TemplateGenerics"/>
    77         <DefaultFilename Value="Packages/TemplateGenerics/TemplateGenerics.lpk" Prefer="True"/>
     81        <PackageName Value="Common"/>
     82        <DefaultFilename Value="Packages/Common/Common.lpk" Prefer="True"/>
    7883      </Item2>
    7984      <Item3>
    80         <PackageName Value="Common"/>
    81         <DefaultFilename Value="Packages/Common/Common.lpk" Prefer="True"/>
     85        <PackageName Value="LCL"/>
    8286      </Item3>
    83       <Item4>
    84         <PackageName Value="LCL"/>
    85       </Item4>
    8687    </RequiredPackages>
    8788    <Units Count="12">

  • branches/generator/generator.lpr

    r137 r189  
    88  {$ENDIF}{$ENDIF}
    99  Interfaces, // this includes the LCL widgetset
    10   Forms, UCore, Common, TemplateGenerics, UFormMain, SysUtils, UBuilder,
     10  Forms, UCore, Common, UFormMain, SysUtils, UBuilder,
    1111  UFormRules, UFormLookupTables, UFormLookupTable
    1212  { you can add units after this };
    … …  
    2626  {$ENDIF}
    2727
    28   Application.Title := 'Language generator';
     28  Application.Scaled:=True;
     29  Application.Title:='Language generator';
    2930  RequireDerivedFormResource := True;
    3031  Application.Initialize;
Note: See TracChangeset for help on using the changeset viewer.