Issue #1013: rename Wiki markup export format to what it is: Textile, plus give it its correct icon

2026-03-13 09:24:25 +08:00 · 2022-02-13 11:28:38 +01:00
parent f11a9dde7c
commit e6d7a899ee
3 changed files with 160 additions and 228 deletions
--- a/res/icons/textile-lang.png
+++ b/res/icons/textile-lang.png
--- a/source/exportgrid.pas
+++ b/source/exportgrid.pas
@@ -8,7 +8,7 @@ uses
  extra_controls, dbstructures, SynRegExpr;

 type
-  TGridExportFormat = (efExcel, efCSV, efHTML, efXML, efSQLInsert, efSQLReplace, efSQLDeleteInsert, efSQLUpdate, efLaTeX, efWiki, efPHPArray, efMarkDown, efJSON);
+  TGridExportFormat = (efExcel, efCSV, efHTML, efXML, efSQLInsert, efSQLReplace, efSQLDeleteInsert, efSQLUpdate, efLaTeX, efTextile, efPHPArray, efMarkDown, efJSON);

  TfrmExportGrid = class(TExtForm)
    btnOK: TButton;
@@ -85,9 +85,9 @@ type
  public
    { Public declarations }
    const FormatToFileExtension: Array[TGridExportFormat] of String =
-      (('csv'), ('csv'), ('html'), ('xml'), ('sql'), ('sql'), ('sql'), ('sql'), ('LaTeX'), ('wiki'), ('php'), ('md'), ('json'));
+      (('csv'), ('csv'), ('html'), ('xml'), ('sql'), ('sql'), ('sql'), ('sql'), ('LaTeX'), ('textile'), ('php'), ('md'), ('json'));
    const FormatToDescription: Array[TGridExportFormat] of String =
-      (('Excel CSV'), ('Delimited text'), ('HTML table'), ('XML'), ('SQL INSERTs'), ('SQL REPLACEs'), ('SQL DELETEs/INSERTs'), ('SQL UPDATEs'), ('LaTeX'), ('Wiki markup'), ('PHP Array'), ('Markdown Here'), ('JSON'));
+      (('Excel CSV'), ('Delimited text'), ('HTML table'), ('XML'), ('SQL INSERTs'), ('SQL REPLACEs'), ('SQL DELETEs/INSERTs'), ('SQL UPDATEs'), ('LaTeX'), ('Textile'), ('PHP Array'), ('Markdown Here'), ('JSON'));
    const FormatToImageIndex: Array[TGridExportFormat] of Integer =
      (49, 50, 32, 48, 201, 201, 201, 201, 153, 154, 202, 199, 200);
    const CopyAsActionPrefix = 'actCopyAs';
@@ -719,21 +719,22 @@ begin
        end;
      end;

-      efWiki: begin
-        Separator := ' || ';
+      efTextile: begin
+        Separator := ' |_. ';
        Encloser := '';
-        Terminator := ' ||'+CRLF;
+        Terminator := ' |'+CRLF;
        if chkIncludeColumnNames.Checked then begin
-          Header := '|| ';
+          Header := '|_. ';
          Col := Grid.Header.Columns.GetFirstVisibleColumn;
          while Col > NoColumn do begin
            if Col <> ExcludeCol then
-              Header := Header + '*' + Grid.Header.Columns[Col].Text + '*' + Separator;
+              Header := Header + Grid.Header.Columns[Col].Text  + Separator;
            Col := Grid.Header.Columns.GetNextVisibleColumn(Col);
          end;
          Delete(Header, Length(Header)-Length(Separator)+1, Length(Separator));
          Header := Header + Terminator;
        end;
+        Separator := ' | ';
      end;

      efPHPArray: begin
@@ -841,7 +842,7 @@ begin
          tmp := tmp + ' VALUES (';
        end;

-        efWiki: tmp := TrimLeft(Separator);
+        efTextile: tmp := TrimLeft(Separator);

        efPHPArray: tmp := #9 + 'array('+CRLF;

@@ -906,7 +907,7 @@ begin
              tmp := tmp + Data + Separator;
            end;

-            efWiki: begin
+            efTextile: begin
              tmp := tmp + Data + Separator;
            end;

@@ -996,7 +997,7 @@ begin
      case ExportFormat of
        efHTML:
          tmp := tmp + '        </tr>' + CRLF;
-        efExcel, efCSV, efLaTeX, efWiki: begin
+        efExcel, efCSV, efLaTeX, efTextile: begin
          Delete(tmp, Length(tmp)-Length(Separator)+1, Length(Separator));
          tmp := tmp + Terminator;
        end;
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -12163,202 +12163,67 @@ object MainForm: TMainForm
          end>
      end
      item
-        Name = 'icons8-wikimarkup'
+        Name = 'icons8-textile'
        SourceImages = <
          item
            Image.Data = {
-              89504E470D0A1A0A0000000D494844520000013C0000013C08030000006ADBFD
-              340000026D504C5445FFFFFFFBFBFBEFEFEFF3F3F3F2F2F2E8E8E8F8F8F8F5F5
-              F5DFDFDFEEEEEEFEFEFEF6F6F6E0E0E0E2E2E2E3E3E3F1F1F1EAEAEAF7F7F7E6
-              E6E6EDEDEDE9E9E9F4F4F4ECECECFDFDFDE1E1E1FCFCFCF9F9F9E7E7E7F0F0F0
-              EBEBEBFAFAFAE5E5E5E4E4E42E2E2E8484844E4E4EB9B9B97676765151514B4B
-              4BCCCCCCCFCFCF505050717171777777C6C6C67C7C7C858585C9C9C9BCBCBC5A
-              5A5A404040D7D7D7DADADA595959CBCBCBBABABAB5B5B5474747DBDBDB5D5D5D
-              555555A7A7A7484848747474B6B6B64A4A4AD0D0D0CACACAA6A6A69E9E9E7575
-              75393939DDDDDD4D4D4DD8D8D8C5C5C5C4C4C48F8F8F9D9D9DC8C8C86F6F6F6D
-              6D6D979797727272B8B8B8C3C3C3CDCDCDD2D2D2494949878787464646DCDCDC
-              ADADAD707070B1B1B16161614242426C6C6C3A3A3A8C8C8C4F4F4FC1C1C16363
-              63C0C0C0ACACACD4D4D48B8B8BBDBDBDD3D3D3B0B0B0414141BBBBBBBEBEBE8E
-              8E8ED9D9D98A8A8A5252524C4C4C9C9C9C949494C7C7C79292928D8D8DB3B3B3
-              ABABAB969696999999959595939393919191909090989898D1D1D15454544444
-              44D6D6D6575757535353434343D5D5D54545455656567D7D7D7878789A9A9A6E
-              6E6E7F7F7F737373383838A3A3A37E7E7E8282828080807B7B7B7A7A7A797979
-              8686865C5C5CDEDEDE2F2F2F6868683F3F3F3737378181816767675F5F5F6565
-              656969693C3C3C3B3B3B3131318888886060603636366B6B6B3E3E3E3D3D3D89
-              89896666663535356464645858586262628383835E5E5E333333323232303030
-              3434345B5B5BB4B4B4C2C2C2A8A8A8AEAEAE9F9F9FA5A5A5CECECEB7B7B79B9B
-              9BA1A1A1A2A2A2A0A0A0A9A9A9AAAAAAA4A4A4BFBFBFA277A4E2000000217452
-              4E53000000000000000000000000000000000000000000000000000000000000
-              000000A092B002000000097048597300000EC400000EC401952B0E1B000014FE
-              49444154789CED5DFB9F14C5B5AFAD5958BA817DCD32E3022B31F7DE44935CEE
-              8D1A35281150940B7A458D11504384A817D1C843D1A85C1114218280BC5D1E13
-              505E05CB02B3B054752F823C7781BFE95677CF74577555CFF42E3BDCCF34E7FB
-              839F7072CEA953DFADAEAEAA6F770F4200000000000000000000000000000000
-              0000000000000000000000000000000000000000000000000000000000000000
-              0000000000000000000000000000000000000000000000000000000000000000
-              0000000000000000000000000000000000008000376F5CEFEBEBEBBD76B5B780
-              3E1FBEF1CAE51ADF1FA76A7101972E2A9E4AF84F3786704FA40BAFA471E885F3
-              E53AD5DB7BF1922E43CD8F2E23A5C3AF9C73E37A6C8B958145CFD60595060D75
-              D3F2A18C0D933B1A8457D268B84D97EB56B72E43DD9918DDB24FBB715DF93C2D
-              837CFE541D32FD76FC864EDAE522394E84C9F3C32B69343A6394669F543318A8
-              EE78BEA33C23C7DCB8338C5A654059D770B1D26243470929176A594746843B5A
-              0CAFA4111F2E5F1921477519861F8AC3C8D9F8E41D94465EB1A178E42923AF18
-              5E49A3D17FF2BC0C7CE4559A3CAFA178E48D543BEA8557D23810F2DC0CB7833C
-              B7A178E4D5D7AA1D75C32B691C10794E86B8E41DB815F29C86625EB6DC53E928
-              AEB07160E4F10CB7873CDE50DC392F55AB76B4C2C6019287530DFDBA6CCFC671
-              FDA1111B85F441CD4DDD71C83B6C70CF945F9D105E49E3B02371C8FB5ECD303C
-              D57C300E2367E29377A831A592876293875229B5CC8A1AE391D7AD6630538D83
-              4E5EB366618FBE8F4D1EF67B2A8457D218933C3583891B4F0D9C3C5BC5FEFCF1
-              66BFD412E4514DACBDCF254F175E39630A0FEBD4D522F7945FB6BA0CCDFFCC77
-              6862B5E41D90C8CB71BB02923FD68C8D424325C8636A2C61561A79DB1F25BC72
-              C6546AAFC59B0E83B230796A061337EFC9ABA19CA45C39F288D5B97B577B7BFB
-              77DFF1FFB4EF2C60C7F66D2D7EA951E4116BEB966EEEDC2E876FDE3D0A15B63F
-              E1F00A1A532D9B7705F517ABDAFEED7E4BACD8B961A8195A366DDC2075DF09DF
-              B5F98418AABD6C19F906A5FDAA424529C61079EB8739EB19ADE76D36EAED466A
-              DDD70A7931D3A6F13F082B431E656B3DF2DCF070CAB0314CDE089FBC58E19533
-              EAED065EF3954A5EBCB469BC5AE62962E465FC70B528D9A88EBC6C84E7ED366A
-              ED69FCA58EBC58693331461E633E793C5C5394642C455E8CF04A1A75764E9EE6
-              B28D979693C7FA431E4E35698A128D25C993C3877CB16AA583CF577CC6B1E97F
-              978F8AF274F1E9271F7B9E8EF3679BEE2A519281FFFED1673E56AE5CF5617D84
-              732479E57B1A45DE1999BC7FE0563F2438D81786B0603C2A93F7F597BC3EBD27
-              42CBA870FF272CFF779C8EF0E413676D8FE46DDFF477D66A4935682325BE3721
-              F483D111CE59346CBD4CDE517D011A632BFA46264F73242593574E6D29439EE0
-              69A2F7A9B808CCB3EB38A3F5743BB9F488B864A47449A9929A7A6C5B486DEF40
-              AD7AE712E495D59506405E19B5A51C7981A789164B0B6ADBFE3E5AC131D12226
-              2EE889D5135D9289D6BC273292B3CE399387CEB91479E574A58190575A6D294B
-              9E10DED221D061316B6D739427C71226EF058E64A23CF955FB374B72EE181395
-              B624796574A5019157526D0991F7954A5E103EF4A0D8788ED8EF6233AAA1D17B
-              884C1E7DA738E9292565D14271DF49C8DA8802CA91575A571A1879A5D4963079
-              6FABE405E12BA46D39210B223D51239537CD847C529CC7D4924675C91D581299
-              B60C792575A5019257426D095FB6EB6A55F20AE159F43F8C4A856F088D3CA1A1
-              C5D226DCA9EA2D33AB2F8913B24FE299BDE9DF99C3CEE5C82BA52B0D94BC68B5
-              4599F35263A3741913ED950A67EC8D084FEEFA57163AADB196351728099764A2
-              37E5F971FE5D61F27CE7B2E495D09514F2341A0663AB55F222D516F586D110AD
-              CBD4CCA3C2D023D6FC77233C4DD413BA5FF0626F16AE5BB5A49554DA731EAC8B
-              2A200679D1BA524CF26A55F2A2D416CDDD365297A9412BA5F587C5FAFCF558A8
-              A1E6D7C327D479B629449E5F52F62F221F79BAD25FA828CE31C88BD495222EDB
-              F0F6AC69AC1F14E4D1AB2DDD9AED59942E93C173A5735CE71837A3F34CE30BB6
-              3CE5F15AE99FDB224A1AB155767C0D67F40594DA9E95ED692AEEDE766C6CB545
-              475E942E63E0575F111764941E486B3D0D3C47B96A89357BA927DF29255D1689
-              66D657B3705AD37BD759254F230045D43F36EEC1406CB5457F3010119EC6C798
-              BCB27939D5A0F3AC3D4565C1C0ADEB4F1E29A192D27CDE15DC6C76A0211839AA
-              B3425E6C5D696C2AEEA94A5CB525E254451F5E8BFF1A5ABC2D70CF7C439E69BC
-              74B6151E79BCAE5E6D49697C56FC8B30F7605D97D673562EDBD8BA5226B55A47
-              DE01CD91544CB525EA482A22FCA63495E5ED933A5129835FB215EE08637F0CAF
-              FFBD9CAFAE173623398B4F79695700D2393768E6BCB8BA5206C7262FA6DA1279
-              9EA70F6F9496B39475356B3CD3F845F5AAE5FD7CBD4D933393BA9C17BDAC7D4B
-              BDD6B50534A434378C98BA52BF0E4307280065233C3DE30BF296F5C43A7E1350
-              3C1B9FD76BCE333539DBF04AB14B8CF5780DE90B48DF8200D4BF93E4810840C2
-              49B236FC39713DCB27A8979C3BA8EC69E2BD5207FDE4E40AAE55721A9979624A
-              42FEDB7FA44653401AAF1BB000D4CF63F84117800CFCAC440BA5EFAB9E267E86
-              28539E5BD93C773693721A78C6742291F78C4FDEE00B40FDD230065B0032F07F
-              2D13EFA3C4EAD1796E62EAC0730A9B3E44C999C18BE50AA6B5E100C911805C64
-              9E96EF055B87693C8F2B4B642FFB7C67A527E734F053624246FE395A202F4102
-              10472BDA26DF0B4851D8113C47AFD73E7A9523642ADF1F8772B66E1413DA6C95
-              70CCA51650AD025081BC27E7CBA3A978C629783ED111DED816CAA5DB1D673967
-              C3949C74CC351907A7026A01D52A00152DAB89D4D8B1C21188EF99C1BD4473B3
-              F5CA6DE0E354CE39C392E78D59F2C84B8C00E40DBD49D2B28C3C3EC6BB6E7DCF
-              0CFE2393EE2902E6AFE1DD17739AE80FA2B34D4FB5897748A580EA1580BCEA2F
-              CAE38A2EF2AEDBC0B37E62303673A147E226736739E7D372874EE2B630790911
-              805CCC904EDF6CF611AA113D33F8CDC3C22CB66FAD34B0168673B64E910AC8CF
-              158574B580AA15800A30A788AB384A9FBF5BF26CE3531E0B6AF9E0C3134269D6
-              63C3A59C267A7B9AF0976064FDA3D850C94B800054C476224D695346BA935ED1
-              B3016F08445846BB464E102BCE8F9372B6A2A9E21440C863FC6FA7212F090290
-              87DF4BAB384A67BAF75BDFB3FE7430E5398773C7C405337987EFDE829CADA85D
-              DAC991F7F9DF4E475EF50B402E4C34C216C9CBB35ED1936F01B606FF778E2E30
-              C4F353461606E439AFEA0CDF23AFB9174975AA0554AF0054C0B81E229D211DCA
-              089E267A24288690CE31E8614B749E28E6AC4B3DD329DDBA0F374875AA0554AF
-              0054342EB4A56390132325CFA34CB86A1F426894C00F77FE9D90B335759D0AC3
-              989043A6D4905A40150B40AE2983274B4F5DE4AC3F899ED98944E08A5F54A678
-              4C90B32F08DB2F13CFB1058D92D2A7E43AD502AA5800728D69FCE00342FDC462
-              1F8B9E63A4E79D16F1EB583C3F75464AF0950DF4B3C7A4BD1E7938683D810210
-              760E9186BE25B7F796737C5974BB6C09B0C7F1740F0B53A44DCF18FEDED544EF
-              8A4FFC116B4273E14586640A408EB10DED9636AFE4957ADF332BFE7F84F4D471
-              CBB809411BCC7AFCEDE0291E748E31F1AA9D542334944001881B33E853F92DAE
-              FD8B7171696BA2FB83FD874DDF776CA39F178E3B897D2E78BE05CD61C26EC5A6
-              DED32C5E43491480B8D140235F971E35B33E4F15CE424C7497203150F67B9EAD
-              158942649E7E2C3CC6B3565A6F77BC1990175140350B409ED1447BE473A4797C
-              2E727D5AD16571C370E46D9EAD062D128F8AE90B77FB29DBC4330646A60F1137
-              7ADA02AA5900F28C265A280E1866BDF1BBC2AABE06AD0A1E42A3E4F458E48CC6
-              FAD9C12D8337D15298F44CF45BF1748BB243DE980CC84B9A00E4197F940E3949
-              FE1D3CD6F31C7D3CB844F3F6C626878D2C3A28BC254BC87F16C8CBA285C29F80
-              277C3138198C2AA0AA05A08271987890C42FC58B7CB350EBAC62BE9C2076ED86
-              FB55830CFE0F61B142E99542CE3496AE7ECB7E4779042D590250C1689C91DE1F
-              A4E3B3AE671ABF245EA0472E3947349C91B934B8391372DCCB69E075132C7144
-              EE1B176E482DA0CA0520CFF89124B65ACB0C64704F03AF60F9A08E657585F0BD
-              E2A716C87B2DAE31833FCD0B3C30F283D2905A40750B40AE318D6F8A232FC7D8
-              0CE43CB252DB287C0C86B0E79D97A6DDF08782E51CC9B1675D631B5EC2C411C9
-              3E531A520BA86E01A840DE1AF18AE3A3E6BAE739F20171885D7518F5CEABA5C9
-              ED45E7CC900FBD17A8F0701963FF5E78CA344C5E920420D7D8F802959AFC8D63
-              34F04C31576E5621BC814F85C249023BEE3C74D1801F141F1FE51BDBBD4A436A
-              01D52E0039C636BC527E2E6C428D4BDE0AB1BA07EA0AE1B5B54BA789F54D77EE
-              0C0DB537A9B4D2DED2A634A41650F502107226FBCBD21B90B98E75AEDF414138
-              23BF0EC21BFF22DE850FFFC8879E91921EF5B3E9159C0E37A41650F5021072C6
-              D8AB538878CD911B4ED75B84575728BDEA871BA94F84D71A09798E0F5D9CFEB5
-              3411D2DFBACFCA4B0DA90554B900E419D3B84B7A849D4DC21903DF14F6AA943C
-              89B28560BE2A110E3D3BEC5D0E4FE3C4179429F9D5A3DE1239E10210763B7145
-              DE977E904277A30F8513786BFD0C5FBFCEA247DF0B6E0E94F4380FA9AC13861D
-              1FA75B8A872D091780DC7FDE27ACD1F8E2EDC47D68349A14D461D3E38D42F8D0
-              2E71553D6D0DAA41D704F673847C886A9486D402AA5D002A18477F2D4632721E
-              99C63722799FE0E081A71AB45B2891D2C9DCF26769D29CFF70F05981040B4045
-              E3D3E226236FEF40E8DE6982C868FF8D4F75C5D8563457DA0B9F3451D32F859E
-              3036BB29D4503205A0A271815409E969437DC1591EB35E7997DF008AB1A6F332
-              B7A048AE1D8EEE9B2F4A707C2B67CA0D255400C21E1D0F4A9FB223FB1F449B83
-              798DD23DA2A4C6F181F44CE448B44D7A5480DC905FEE4EAC005420CF903F6B45
-              1F193A51CCB5D37915D70F36D178E901F973A85D7AAA3E3723DC504205A082D1
-              DC615351375CB2D7F673118BBDE66CF385F005C2E13361BB9B1E126A26D6E3C3
-              C30DE90BA87E01C8FD672B9FF4C4E74CACD373C565F3D6A5A1F0A5D2C3410796
-              8A477C943E6D2A0D690BA87E01C8FD67163D7144EC468E768937805F84C387AC
-              16EF186F7C24B64BE945DD6705122A00216716ABEB919FADCB051731233B95F0
-              EEE0F1A09CB5FF75E976919FD9A4252F910290F3EF36FC6FDAB7A4DC44EC5F43
-              E1067A49283227514DC937196D436A014910803C0DA29759FA577D2CD231C2D3
-              AFFDF0349AB13FE4E3FFAFBC3D1E19BA86D402122100B9A2D87DD2A4278059F7
-              D786C20DD4207FCD5974E7ABBC365D436A010910800A46E35F22AEDB3C9DA384
-              67D1CF35EFCEBBADE60EBFECEE89EE0C01C8331A787CC487E529BB107E2D08D7
-              A03EA27D0DD739CFAAD337A416900801C8335E88FA2AFFB42784C74EBCF02C9A
-              D5A977266C0B6AD536A416900401A8609C217E97422CEBF458FF6DBE20FCEE89
-              11EF3093A9C533E73B42002A185BEED70E3D4A7F237F73CB0DCFA28DFA819AB3
-              674434A416900401A8683CA9BB07E40879AA702C2C869BE8BC963B426667231A
-              520B488400E4229D3AA7BB1089B5F55EFF0D6631FC51EDDD96910D510DA9F644
-              0840C8EBC93ADD07541879658C363C3D4577DD32765E3836BD3304201743355F
-              2BE305FC50FC344A285CBB9F63F94B1279778200E4A006CD51770DC4625F4484
-              4FD59047C9C411510DA9F6A40840C839D37B4DBB5879561B5E9BBA577391DBF6
-              7643D750B20520E41C4B2DFD5AF9F211219DF511E1F5BF52BD29DB86339A8692
-              2C0079C8E23DE12D17F1DE21D5CB37ED343C52897578A6BCA9B90304A0227973
-              48F80E4AD98A88F00CBEA64C917C37E2FE989DD290BE80A408409EF191F0891E
-              BF0E1779CF3B29E119BC787F78D66364121EAB6B485F404204A082F167E1333D
-              E2C9DDBA70030FFB05090F3D721567B40D690B48880054349E0AFFFA009DD718
-              159EC1DFD23079F32FB9DF7ED492975801A868FC22FC53896C156E8B08CFE0CF
-              43332461D38DC88634F6A408402EB2E85278E1CB96FB0F8B85C34D74EFD69033
-              D9E91D5EDD6102900B130DF9A574DD32F2D513C26327E1F0A609F2D0236C72E1
-              E4EFCE12800AC6EC469A2701F8D2236D96089FE7FCBA9488FA120DA9F6E40840
-              5E455799754FAE887BEEB1C6E36C89F06D823377270FD5956848B5274600728D
-              26AAEF5BBEFCFAF5EBBD1CDBAE5DBDFAD3CB25C3C7FC61B9E7E9FCB777C1D427
-              4B35A4DA13240055DAA8DA132400B946B3C6459B0B6CB4A54B869B82675B5B4D
-              4DB65443AA3D410250A58DAA3D490250858DAA3D390250C58DAA3D390250C58D
-              AABDE20210B97D0250858DAAFD1605A078BFE93D6001C8FB4DEFD8E19535AA76
-              03CF1AB000D4908AF79BDEE95B1080CC08CFDB6CD4DB8D5B1080D2A9D5BA9127
-              6918C4EADCBDABBDFDBBEFDA1DEC2C60C7F66D2D7ECE68F2B66EE9E6CEED72F8
-              E6DDA390B7D38929B50C8631951AB77957507FB1AA0DDFEE0FCF799A0C2D9B76
-              6D90BAEF84EFDA7C420CD592E7FC06115340F2C79A8BBF3813499E336ED558FE
-              E74AA3C24E279ED43228C6D4487E1129C550F9004C2B0099B8794F5E0D6534F4
-              B970CD656B395AA882FDF9E3CD7EA925C8A39A587B9F818A3B9D5852CB601831
-              AEEFD4D522F73442006A3E95EFD0C4CA3D8D204F03CA0E35BBD2422901280A87
-              7DF2E2492D8361C478D891F2956905203EF20EC661A4FFE49512806290174B6A
-              1914637FC893335490BC1202501CF262A9428362EC0F7952864A92172D00C522
-              2F8E2A3428C67E912766E81F7967E2B81EACF3B5852801280A479C5F490A7A57
-              566A191CA371380E791A01C8407587E230A239928A415E94001493BCB252CBE0
-              18FB495E90A1C2E445084071C92BAB0A0D8AB1BFE4F9192A4D9E5E008A4D5E19
-              A965708CFD26AF98A102E4750D172BD50A4091E48D0877B4B4D4323846DC6FF2
-              FC0CC3FB415E573E4FCB209F3F258DBC624327ED72911C279491575A6A191CA3
-              D119A334FBA49A818FBCE3F98EF28C1C73E37A6C4BDDC9C9B0E8D93AB952AFA1
-              6E5A3E94B1916A474BAB42836134DCA6CB75AB5B97A1EE4C8C6ED9A7DDB89B37
-              AEF7F5F5F57AB876B5B7B7CF47D178EDCAE59A50A56E43972E863DD5F09F6E64
-              FE3F04A0A117CE97E914375EBCA4CB50F3A3CB48E9F0E7262300000000000000
-              0000000000000000000000000000000000000000000000000000000000000000
-              0000000000000000000000000000000000000000000000000000000000000000
-              000000000000000000000000000000000000000000000000000009C4FF0172AE
-              9D982FABA9400000000049454E44AE426082}
+              89504E470D0A1A0A0000000D4948445200000060000000600803000000D54687
+              0A000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              0300504C5445000000FFE6AD84E610CEE610E6E69CB5EFE6B5A5EF84EFE684A5
+              EF52BD6B526BEF52BD29526BAD19BD6B196BEF19BD29196BADB5CEE6B5A5CE84
+              CEE684A5CE52BD4A526BCE52BD08526B8C19BD4A196BCE19BD08196B8CB594A5
+              8494A54210194210B50810B552634ACE311984319C84A531CEA531CE73DECEEF
+              63CE735A8473DE84EF63847319CE739CCE731984739CA5525AA5105AEF10DEEF
+              105AA510DEA51019EF109CEF1019A5109CA5A510EFA510CE52DECECE63CE525A
+              8452DE84CE63845219CE529CCE521984529CE6EFBD423A19A59C734242421008
+              007B735AE6EFEF849C52E6C594193A0842104A4210E642107B0810E608107B08
+              104AB5B59C5A421952EFEF52EF6B52946B529CEF52EF29529CAD52942952EFAD
+              19EF6B199CEF19EF29199CADEFA57319946B19EFEF19942919EFAD526B6B52C5
+              EF526B2952C5AD196B6B19C5EF196B2919C5AD84E631CEE63184A573A5E610EF
+              E61052EFCE52EF4A52944A529CCE52EF08529C8C52940852EF8C19EF4A199CCE
+              19EF08199C8CEFA55219944A19EFCE19940819EF8C52C5CE526B0852C58C196B
+              4A19C5CE196B0819C58C4242B50842B5C5A573EF73DEEFEF63EF735AA573DEA5
+              EF63A5315AEF31DEEF315AA531DEA53119EF319CEF3119A5319CA57319EF739C
+              EF7319A5739CA5A531EFA5317B525AEF52DEEFCE63EF525AA552DEA5CE63A552
+              19EF529CEF5219A5529C84B5A56310196310B52910B5193A21191021E6C5ADE6
+              C5EFE69CEFE6C5CEE69CCE4242E642427B0842E608427B08424AE69C945A424A
+              A59C52A5E631EFE631C5A55263104A6310E663107B2910E629107B29104A6342
+              B52942B584106BCE10EFCE106B8410EF841029CE10ADCE10298410AD84B510CE
+              B51084104ACE10CECE104A8410CE841008CE108CCE100884108C849410CE9410
+              B5EFB584EFB5B5CEB584CEB5B5EF9484EF94B5CE9484CE949C736B6342E66342
+              7B2942E629427B29424AE69CB584316BCE31EFCE316B8431EF843129CE31ADA5
+              734A84314ACE31CECE314A8431CE843108CE318C002919FFF79CFFDE94000019
+              FFDEAD000000F264CAE80000010074524E53FFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0053F7072500000009704859730000
+              0EC300000EC301C76FA86400000289494441546843ED97DDADE3201046417225
+              F4626C241EB72E6A5917E0765C86B3DF3703896F1C7922DDF51BE7612180E7C0
+              F0B3BAEE71335D60D205265D60D205265D60D205265D60D205265D60D20526EE
+              E16FE5E16AE536BAC0E47F09F6BD56DEF995609B4246EC18C6C54DB5ED9DDF08
+              36E7DCE87D41E16E1104064639C4AF0425855ABB668F296A8D535F59C9DF0846
+              E7E65ABDA4CCCEB599E458B4FC4680EFBE12301DEF4BFD46C089CD39E7417E0D
+              71DB220E08128236B0FB81C5E0F7C4BC480B02974DB27514E4E7A78A0A062448
+              49FC15600323C6311E885A499C87527C585048DC9720D740E1792D5490D795CD
+              EBBA6246C35FC42E1C3A673F6860B462441AE2CA080B06661F58FD29900DCAFC
+              17C757F9B0077461EEFC8AC9A601C3F7D16DEC3DECC19F16B70906AC6941C94F
+              EA49FB20E0688EF228D982C80EB1530D7B25E0CD631FC7C8F9056741BD9FD2E2
+              B8E719F39AA31B35AD5782092597C90BD2727416F07E8E1B4029027D0BB01FC2
+              9580BB1EF0A5846007380B64BB2BDA22396D4BBE1270CD0DE9009F5710F68AB4
+              C8D2DBAE598258BF6CE7F42CE0749B5E496EE536688EAE047A1C7E721630E32D
+              E14271CBCEB0BACBACD5749D04C7DC378E029E7E1C4B6E550DC19079C6ADD5C4
+              B1E970424E029635952D432F815CCB52E22E7374632C651B7183710D18987748
+              BE95200903D5F5148894D370019FA645DFD983409E045C31AC420E289960C3CA
+              3858BB198E3301C1EB8B35E2516A15BF3F8F20DF34E129F06971F38405809C96
+              D92D1327BCE1D9E1031558AE2BBAF384BE8068DA82CE6705947599E785FF5557
+              5E8243DEC88F1F6F5CF5BD7314DC421798DCFFF741FD43E436BAC0A40B4CBAC0
+              A40B4CBAC0A40B4CBAC0A40B4CBAC0A40B4C6E163C1EFF0089F464836E63FC71
+              0000000049454E44AE426082}
          end>
      end
      item
@@ -17890,7 +17755,7 @@ object MainForm: TMainForm
        CollectionIndex = 134
        CollectionName = 'icons8-close-button-small-centered'
        Disabled = False
-        Name = 'icons8-close-button-other'
+        Name = 'icons8-close-button-small-centered'
      end
      item
        CollectionIndex = 135
@@ -18008,9 +17873,9 @@ object MainForm: TMainForm
      end
      item
        CollectionIndex = 154
-        CollectionName = 'icons8-wikimarkup'
+        CollectionName = 'icons8-textile'
        Disabled = False
-        Name = 'icons8-wikimarkup'
+        Name = 'icons8-textile'
      end
      item
        CollectionIndex = 155
@@ -18275,6 +18140,36 @@ object MainForm: TMainForm
        CollectionName = 'code-folding'
        Disabled = False
        Name = 'code-folding'
+      end
+      item
+        CollectionIndex = 199
+        CollectionName = 'icons8-markdown'
+        Disabled = False
+        Name = 'icons8-markdown'
+      end
+      item
+        CollectionIndex = 200
+        CollectionName = 'icons8-js'
+        Disabled = False
+        Name = 'icons8-js'
+      end
+      item
+        CollectionIndex = 201
+        CollectionName = 'icons8-sql'
+        Disabled = False
+        Name = 'icons8-sql'
+      end
+      item
+        CollectionIndex = 202
+        CollectionName = 'icons8-php'
+        Disabled = False
+        Name = 'icons8-php'
+      end
+      item
+        CollectionIndex = 203
+        CollectionName = 'server-interbase'
+        Disabled = False
+        Name = 'server-interbase'
      end>
    ImageCollection = ImageCollectionIcons8
    ImageNameAvailable = False
@@ -22435,27 +22330,63 @@ object MainForm: TMainForm
        SourceImages = <
          item
            Image.Data = {
-              89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
-              61000002564944415478DA63FCFFFF3F032580916203162D5A14FBF2E54B7166
-              66E6BF3F7EFCE0F0F3F3DBB475EB566F6E6EEEAF7FFEFC61F9F2E50B8FAEAEEE
-              E58B172FEA7371717D3335353D7DF7EE5DE5B76FDF0AABA8A8DC613C77EE9CA1
-              A5A5E5F15FBF7EB175777797E6E7E74F041A1A979292320764C39E3D7B5C409A
-              ECECEC0E2524242C484A4A9AF7E0C103054F4FCFED870F1FB6057B012401D2E4
-              EBEBBB79E3C68DFE208DC6C6C667CF9F3F6F585656D69591913123373777F2E6
-              CD9B7D41722035A74F9F366D6969A9011B70F6EC59633333B353206FDCBB774F
-              494646E6C982050B1240B6898B8BBFF4F6F6DE0A72918585C50990010101011B
-              7A7B7B8B959595EFC203D1C6C6E6C8B163C7ACAAABAB5B9B9B9B6BBF7FFFCE29
-              2B2BFBF8DDBB77424E4E4EFB405E01A97BFAF4A9746A6AEAEC6DDBB679A1C4C2
-              8A152B22A2A2A296898989BD7AF8F0A13C3B3BFBCFE2E2E2DEFEFEFE427D7DFD
-              8B20EF80D4819CADADAD7D353030703D8A01BF7FFF66555454BCFFECD933A9F9
-              F3E727C6C7C72FDCB16387879797D73690FCFEFDFB1D4101E9E8E8B87FEFDEBD
-              CE20EF62A40390D3EBEBEB1B4101080AA49090903520034F9C3861111414B42E
-              3B3B7BEA9123476C6A6B6B9BB12624507A50505078008AD2499326E55DB870C1
-              20393979AE9595D5311616963F0E0E0E0740812B2525F50C674A0485F6BC79F3
-              92383939BF5FBF7E5D534E4EEE11289D9C3C79D21C94C8366CD810803729836C
-              0579212B2B6BDAE4C9937341624B972E8D8E8D8D5D0CD20C3284605E68000290
-              4B40E901C40779A9BCBCBCB3ABABAB8C9595F537753313A50600007A0B3F0EC1
-              C459730000000049454E44AE426082}
+              89504E470D0A1A0A0000000D4948445200000060000000600803000000D54687
+              0A000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
+              0300504C5445000000FFE6AD84E610CEE610E6E69CB5EFE6B5A5EF84EFE684A5
+              EF52BD6B526BEF52BD29526BAD19BD6B196BEF19BD29196BADB5CEE6B5A5CE84
+              CEE684A5CE52BD4A526BCE52BD08526B8C19BD4A196BCE19BD08196B8CB594A5
+              8494A54210194210B50810B552634ACE311984319C84A531CEA531CE73DECEEF
+              63CE735A8473DE84EF63847319CE739CCE731984739CA5525AA5105AEF10DEEF
+              105AA510DEA51019EF109CEF1019A5109CA5A510EFA510CE52DECECE63CE525A
+              8452DE84CE63845219CE529CCE521984529CE6EFBD423A19A59C734242421008
+              007B735AE6EFEF849C52E6C594193A0842104A4210E642107B0810E608107B08
+              104AB5B59C5A421952EFEF52EF6B52946B529CEF52EF29529CAD52942952EFAD
+              19EF6B199CEF19EF29199CADEFA57319946B19EFEF19942919EFAD526B6B52C5
+              EF526B2952C5AD196B6B19C5EF196B2919C5AD84E631CEE63184A573A5E610EF
+              E61052EFCE52EF4A52944A529CCE52EF08529C8C52940852EF8C19EF4A199CCE
+              19EF08199C8CEFA55219944A19EFCE19940819EF8C52C5CE526B0852C58C196B
+              4A19C5CE196B0819C58C4242B50842B5C5A573EF73DEEFEF63EF735AA573DEA5
+              EF63A5315AEF31DEEF315AA531DEA53119EF319CEF3119A5319CA57319EF739C
+              EF7319A5739CA5A531EFA5317B525AEF52DEEFCE63EF525AA552DEA5CE63A552
+              19EF529CEF5219A5529C84B5A56310196310B52910B5193A21191021E6C5ADE6
+              C5EFE69CEFE6C5CEE69CCE4242E642427B0842E608427B08424AE69C945A424A
+              A59C52A5E631EFE631C5A55263104A6310E663107B2910E629107B29104A6342
+              B52942B584106BCE10EFCE106B8410EF841029CE10ADCE10298410AD84B510CE
+              B51084104ACE10CECE104A8410CE841008CE108CCE100884108C849410CE9410
+              B5EFB584EFB5B5CEB584CEB5B5EF9484EF94B5CE9484CE949C736B6342E66342
+              7B2942E629427B29424AE69CB584316BCE31EFCE316B8431EF843129CE31ADA5
+              734A84314ACE31CECE314A8431CE843108CE318C002919FFF79CFFDE94000019
+              FFDEAD000000F264CAE80000010074524E53FFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+              FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0053F7072500000009704859730000
+              0EC300000EC301C76FA86400000289494441546843ED97DDADE3201046417225
+              F4626C241EB72E6A5917E0765C86B3DF3703896F1C7922DDF51BE7612180E7C0
+              F0B3BAEE71335D60D205265D60D205265D60D205265D60D205265D60D20526EE
+              E16FE5E16AE536BAC0E47F09F6BD56DEF995609B4246EC18C6C54DB5ED9DDF08
+              36E7DCE87D41E16E1104064639C4AF0425855ABB668F296A8D535F59C9DF0846
+              E7E65ABDA4CCCEB599E458B4FC4680EFBE12301DEF4BFD46C089CD39E7417E0D
+              71DB220E08128236B0FB81C5E0F7C4BC480B02974DB27514E4E7A78A0A062448
+              49FC15600323C6311E885A499C87527C585048DC9720D740E1792D5490D795CD
+              EBBA6246C35FC42E1C3A673F6860B462441AE2CA080B06661F58FD29900DCAFC
+              17C757F9B0077461EEFC8AC9A601C3F7D16DEC3DECC19F16B70906AC6941C94F
+              EA49FB20E0688EF228D982C80EB1530D7B25E0CD631FC7C8F9056741BD9FD2E2
+              B8E719F39AA31B35AD5782092597C90BD2727416F07E8E1B4029027D0BB01FC2
+              9580BB1EF0A5846007380B64BB2BDA22396D4BBE1270CD0DE9009F5710F68AB4
+              C8D2DBAE598258BF6CE7F42CE0749B5E496EE536688EAE047A1C7E721630E32D
+              E14271CBCEB0BACBACD5749D04C7DC378E029E7E1C4B6E550DC19079C6ADD5C4
+              B1E970424E029635952D432F815CCB52E22E7374632C651B7183710D18987748
+              BE95200903D5F5148894D370019FA645DFD983409E045C31AC420E289960C3CA
+              3858BB198E3301C1EB8B35E2516A15BF3F8F20DF34E129F06971F38405809C96
+              D92D1327BCE1D9E1031558AE2BBAF384BE8068DA82CE6705947599E785FF5557
+              5E8243DEC88F1F6F5CF5BD7314DC421798DCFFF741FD43E436BAC0A40B4CBAC0
+              A40B4CBAC0A40B4CBAC0A40B4CBAC0A40B4C6E163C1EFF0089F464836E63FC71
+              0000000049454E44AE426082}
          end>
      end
      item