Skip to content

Commit cc78ae8

Browse files
alexx2000alexx2000
authored
Merge pull request doublecmd#19 from Skif-off/gh-pages
ADD: Config.: ActiveRight option. Lua: ExtractFile* functions. DEL: W…
2 parents 3d095db + 63cd790 commit cc78ae8

File tree

13 files changed

+167
-37
lines changed

13 files changed

+167
-37
lines changed

‎doc/en/cm_options.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ <h1>2.8.1. Parameters of internal command <a href="cmds.html#cm_Options">cm_Opti
159159
</tr>
160160
<tr>
161161
<td class="varcell"><div class="firstcolumnaleft">TfrmOptionsDragDrop</div></td>
162-
<td class="hintcell">Mouse &gt; Drag & drop</td>
162+
<td class="hintcell">Mouse &gt; Drag &amp; drop</td>
163163
</tr>
164164
<tr>
165165
<td class="varcell"><div class="firstcolumnaleft">TfrmOptionsPluginsGroup</div></td>

‎doc/en/cmds.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ <h2><a name="catactivepanel">2.1. Active Panel</a></h2>
171171
<tr>
172172
<td class="innerdescparamcell">columnset</td>
173173
<td class="innerdescvaluecell"><I>column set name</i></td>
174-
<td class="innerdescdesccell">show user defined column set<sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup></td>
174+
<td class="innerdescdesccell">show user defined column set</td>
175175
</tr>
176176
<tr>
177177
<td class="innerdescparamcell" colspan="2"><I>(nothing, default)</i></td>
@@ -345,7 +345,7 @@ <h2><a name="catleftpanel">2.2. Left Panel</a></h2>
345345
<tr>
346346
<td class="innerdescparamcell">columnset</td>
347347
<td class="innerdescvaluecell"><I>column set name</i></td>
348-
<td class="innerdescdesccell">show user defined column set<sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup></td>
348+
<td class="innerdescdesccell">show user defined column set</td>
349349
</tr>
350350
<tr>
351351
<td class="innerdescparamcell" colspan="2"><I>(nothing, default)</i></td>
@@ -429,7 +429,7 @@ <h2><a name="catrightpanel">2.3. Right Panel</a></h2>
429429
<tr>
430430
<td class="innerdescparamcell">columnset</td>
431431
<td class="innerdescvaluecell"><I>column set name</i></td>
432-
<td class="innerdescdesccell">show user defined column set<sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup></td>
432+
<td class="innerdescdesccell">show user defined column set</td>
433433
</tr>
434434
<tr>
435435
<td class="innerdescparamcell" colspan="2"><I>(nothing, default)</i></td>
@@ -946,7 +946,7 @@ <h2><a name="catconfiguration">2.5. Configuration</a></h2>
946946
</tr>
947947
<tr>
948948
<td class="cmdcell"><img class="IntCmdImage" title="cm_ConfigSavePos" alt="cm_ConfigSavePos" src="../../pixmaps/dctheme/32x32/actions/cm_configsavepos.png">
949-
<div class="cmdname"><a name="cm_ConfigSavePos">cm_ConfigSavePos</a><p class="versionref">Version 1.0.0 +</p></div>
949+
<div class="cmdname"><a name="cm_ConfigSavePos">cm_ConfigSavePos</a></div>
950950
<td class="cmdhintcell">Will save current state and position of the main window of DC.<br></td>
951951
</tr>
952952
<tr>
@@ -1002,7 +1002,7 @@ <h2><a name="catmiscellaneous">2.7. Miscellaneous</a></h2>
10021002
</tr>
10031003
<tr>
10041004
<td class="cmdcell"><img class="IntCmdImage" title="cm_Benchmark" alt="cm_Benchmark" src="../../pixmaps/dctheme/32x32/actions/cm_benchmark.png">
1005-
<div class="cmdname"><a name="cm_Benchmark">cm_Benchmark<sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup></a></div>
1005+
<div class="cmdname"><a name="cm_Benchmark">cm_Benchmark</a></div>
10061006
<td class="cmdhintcell">Launch a simple benchmark consisting in running supported hash functions.</td>
10071007
</tr>
10081008
<tr>

‎doc/en/configxml.html‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,27 @@ <h2>3. <a name="manualed">Options to change manually</a></h2>
6565
<tr class="rowcategorytitle"><th colspan="2">Setting required to be changed manually if necessary</th></tr>
6666
<tr class="rowsubtitle"><th class="namecolumn">Tag</th><th class="categorydesccolumn">Description</th></tr>
6767

68+
<tr>
69+
<td class="varcell"><div class="firstcolumnaleft">&lt;ActiveRight&gt;<BR><small>from &lt;Behaviours&gt;</small></div></td>
70+
<td class="hintcell">
71+
The right panel will be active when Double Commander starts.<BR>
72+
<table class="innercmddesc">
73+
<tr class="rowinnerdesc">
74+
<th class="innerdescheader">Value</th>
75+
<th class="innerdescheader">Description</th>
76+
</tr>
77+
<tr>
78+
<td class="innerdescvaluecell">True</td>
79+
<td class="innerdescdesccell">Right panel</td>
80+
</tr>
81+
<tr>
82+
<td class="innerdescvaluecell">False</td>
83+
<td class="innerdescdesccell">Left panel (default)</td>
84+
</tr>
85+
</table>
86+
<I>Example:</i> <code>&lt;ActiveRight&gt;True&lt;/ActiveRight&gt;</code>
87+
</td>
88+
</tr>
6889
<tr>
6990
<td class="varcell"><div class="firstcolumnaleft">&lt;SingleClickStart&gt;<BR><small>from &lt;Behaviours&gt;&lt;Mouse&gt;</small></div></td>
7091
<td class="hintcell">
@@ -347,19 +368,19 @@ <h2>3. <a name="manualed">Options to change manually</a></h2>
347368
</tr>
348369

349370
<tr>
350-
<td class="varcell"><div class="firstcolumnaleft">&lt;TabSpaces&gt;<sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup><BR><small>from &lt;Viewer&gt;</small></div></td>
371+
<td class="varcell"><div class="firstcolumnaleft">&lt;TabSpaces&gt;<BR><small>from &lt;Viewer&gt;</small></div></td>
351372
<td class="hintcell">
352373
For the internal viewer, set the width of tab stops to use.<BR>
353-
The valid range goes from 1 to 32 and default value is 8.<BR>
374+
The valid range goes from 1 to 32 and default value is 8.<BR>
354375
<I>Example:</i> <code>&lt;TabSpaces&gt;4&lt;/TabSpaces&gt;</code>
355376
</td>
356377
</tr>
357378

358379
<tr>
359-
<td class="varcell"><div class="firstcolumnaleft">&lt;MaxTextWidth&gt;<sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup><BR><small>from &lt;Viewer&gt;</small></div></td>
380+
<td class="varcell"><div class="firstcolumnaleft">&lt;MaxTextWidth&gt;<BR><small>from &lt;Viewer&gt;</small></div></td>
360381
<td class="hintcell">
361382
For the internal viewer, configure the maximum number of characters to be displayed on one text line prior to wrap it up to the next one.<BR>
362-
The valid range goes from 80 to 16384 and default value is 1024.<BR>
383+
The valid range goes from 80 to 16384 and default value is 1024.<BR>
363384
<I>Example:</i> <code>&lt;MaxTextWidth&gt;1024&lt;/MaxTextWidth&gt;</code>
364385
</td>
365386
</tr>

‎doc/en/help.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ <h2><a name="mnu_file">3.1.1. "Files"</a></h2>
215215
<p>This function is very useful, if you have small drives and large files. It is possible to move the file parts (as in TC).</p>
216216

217217
<p>Item <a name="012_controlnaya_summa"><span class="bold">Calculate check sum...</span></a> (internal command <tt><a name="cm_CheckSumCalc">cm_CheckSumCalc</a></tt>) is used to calculate the <a href="http://en.wikipedia.org/wiki/Checksum">checksum</a> to check files integrity. The following checksums are available:
218-
BLAKE2 (BLAKE2s, BLAKE2sp, BLAKE2b<sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup>, BLAKE2bp<sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup>),
219-
CRC32, HAVAL, MD4, MD5, RIPEMD128, RIPEMD160, SFV, SHA, SHA2 (SHA2-224, SHA2-256, SHA2-384, SHA2-512), SHA3 (SHA3-224, SHA3-256, SHA3-384, SHA3-512), Tiger.</p>
218+
BLAKE2 (BLAKE2s, BLAKE2sp, BLAKE2b, BLAKE2bp), CRC32, HAVAL, MD4, MD5, RIPEMD128, RIPEMD160, SFV, SHA,
219+
SHA2 (SHA2-224, SHA2-256, SHA2-384, SHA2-512), SHA3 (SHA3-224, SHA3-256, SHA3-384, SHA3-512), Tiger.</p>
220220
<p class="figure"><img class="largeimage" alt="Calculate checksum" title="Calculate checksum" src="images/imgDC/pic14-8-1.png"></p>
221221

222222
<p><span class="italic">Save check sum file(s) to:</span>&nbsp;&mdash; line specifies name and path to the calculated checksum.</p>

‎doc/en/lua.html‎

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ <h2>3.1. <a name="libdc">DC library</a></h2>
109109
<tr class="rowcategorytitle"><th colspan="2">DC library</th></tr>
110110
<tr class="rowsubtitle"><th class="categorynamecolumn">Function name</th><th class="categorydesccolumn">Description</th></tr>
111111
<tr>
112-
<td class="varcell"><div class="firstcolumnaleft">DC.LogWrite <sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup></div></td>
112+
<td class="varcell"><div class="firstcolumnaleft">DC.LogWrite</div></td>
113113
<td class="hintcell">
114114
<p class="definition">DC.LogWrite(Message, MsgType, bForce, bLogFile)</p>
115115
<p>Write a message to the log window.</p>
@@ -199,7 +199,7 @@ <h2>3.2. <a name="librarysystem">System library</a></h2>
199199
</td>
200200
</tr>
201201
<tr>
202-
<td class="varcell"><div class="firstcolumnaleft">SysUtils.GetTickCount <sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup></div></td>
202+
<td class="varcell"><div class="firstcolumnaleft">SysUtils.GetTickCount</div></td>
203203
<td class="hintcell">
204204
<p class="definition">SysUtils.GetTickCount()</p>
205205
<p>Returns an increasing clock tick count. It is useful for time measurements, but no assumtions should be made as to the interval between the ticks.</p>
@@ -242,7 +242,7 @@ <h2>3.2. <a name="librarysystem">System library</a></h2>
242242
<li><var>Name</var> : The file name (without path).</li>
243243
<li><var>Attr</var> : The file attributes of the file (see details <a href="#detailattr">here</a>).</li>
244244
<li><var>Size</var> : The size of the file in bytes.</li>
245-
<li><var>Time</var> : The time stamp of the file (seconds since Jan 01 1970<sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup>)</li>
245+
<li><var>Time</var> : The time stamp of the file (seconds since Jan 01 1970)</li>
246246
</ul>
247247
</td>
248248
</tr>
@@ -273,6 +273,45 @@ <h2>3.2. <a name="librarysystem">System library</a></h2>
273273
<p>In Unix/Linux system will be a " / " and in Windows will be " \ "</p>
274274
</td>
275275
</tr>
276+
<tr>
277+
<td class="varcell"><div class="firstcolumnaleft">SysUtils.ExtractFileName</div></td>
278+
<td class="hintcell">
279+
<p class="definition">sName = SysUtils.ExtractFileName(FileName)</p>
280+
<p>Extract the filename part from a full path filename.</p>
281+
<p>The filename consists of all characters after the last directory separator character ("/" or "\") or drive letter.</p>
282+
</td>
283+
</tr>
284+
<tr>
285+
<td class="varcell"><div class="firstcolumnaleft">SysUtils.ExtractFilePath</div></td>
286+
<td class="hintcell">
287+
<p class="definition">sPath = SysUtils.ExtractFilePath(FileName)</p>
288+
<p>Extract the path from a filename (including drive letter).</p>
289+
<p>The path consists of all characters before the last directory separator character ("/" or "\"), including the directory separator itself.</p>
290+
</td>
291+
</tr>
292+
<tr>
293+
<td class="varcell"><div class="firstcolumnaleft">SysUtils.ExtractFileDir</div></td>
294+
<td class="hintcell">
295+
<p class="definition">sDir = SysUtils.ExtractFileDir(FileName)</p>
296+
<p>Extract only the directory part of <var>FileName</var>, including a drive letter.</p>
297+
<p>The directory name has NO ending directory separator, in difference with <code>SysUtils.ExtractFilePath</code>.</p>
298+
</td>
299+
</tr>
300+
<tr>
301+
<td class="varcell"><div class="firstcolumnaleft">SysUtils.ExtractFileDrive</div></td>
302+
<td class="hintcell">
303+
<p class="definition">sDrive = SysUtils.ExtractFileDrive(FileName)</p>
304+
<p>Extract the drive part from a filename.</p>
305+
<p>Note that some operating systems do not support drive letters.</p>
306+
</td>
307+
</tr>
308+
<tr>
309+
<td class="varcell"><div class="firstcolumnaleft">SysUtils.ExtractFileExt</div></td>
310+
<td class="hintcell">
311+
<p class="definition">sExt = SysUtils.ExtractFileExt(FileName)</p>
312+
<p>Return the extension from a filename (all characters after the last "." (dot), including the "." character).</p>
313+
</td>
314+
</tr>
276315
</table>
277316
<p class="navback"><a href="#topofpage">(back to top)</a></p>
278317
</div>
@@ -538,7 +577,7 @@ <h2>3.4. <a name="librarydialogs">Dialogs library</a></h2>
538577
</td>
539578
</tr>
540579
<tr>
541-
<td class="varcell"><div class="firstcolumnaleft">Dialogs.InputListBox <sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup></div></td>
580+
<td class="varcell"><div class="firstcolumnaleft">Dialogs.InputListBox</div></td>
542581
<td class="hintcell">
543582
<p class="definition">sAnswer = Dialogs.InputListBox(Title, Msg, Items, sDefault)</p>
544583
<p>Displays a dialog box to allow the user to choose from a list of items.</p>
@@ -675,7 +714,7 @@ <h2>3.4.6. <a name="querysample">Example of usage of the Dialogs.InputQuery</a><
675714
</div>
676715

677716
<div>
678-
<h2>3.5. <a name="libraryutf8">UTF-8 library <sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup></a></h2>
717+
<h2>3.5. <a name="libraryutf8">UTF-8 library</a></h2>
679718
<p>This library provides basic support for UTF-8 encoding.</p>
680719
<p>It provides all its functions inside the table <code>LazUtf8</code>.</p>
681720
<table>

‎doc/en/multiarc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ <h2>5.2. <a name="variables">Variables to interface with external archiver</a></
163163
<tr><td class="varcell"><div class="firstcolumnaleft">%V</div></td><td class="hintcell">The volume size (for multivolume archive)</td></tr>
164164
<tr><td class="varcell"><div class="firstcolumnaleft">%W</div></td><td class="hintcell">The password</td></tr>
165165
<tr><td class="varcell"><div class="firstcolumnaleft">%E&lt;errorlevel&gt;</div></td><td class="hintcell">Maximum acceptable command errorlevel.<BR>For example, %E2 indicates that errorlevels 0, 1 and 2 are acceptable.<BR>This variable may be specified in any place of command.<BR>If it is absent, only errorlevel 0 is considered as successful.</td></tr>
166-
<tr><td class="varcell"><div class="firstcolumnaleft">%O&lt;modifier&gt; <sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup></div></td><td class="hintcell">By default, multiarc convert archiver output from OEM encoding to UTF-8.<BR>Use this to override encoding. See below the possible encoding modifiers.<BR>Can be used with "List" action only.</td></tr>
166+
<tr><td class="varcell"><div class="firstcolumnaleft">%O&lt;modifier&gt;</div></td><td class="hintcell">By default, multiarc convert archiver output from OEM encoding to UTF-8.<BR>Use this to override encoding. See below the possible encoding modifiers.<BR>Can be used with "List" action only.</td></tr>
167167
<tr><td class="varcell"><div class="firstcolumnaleft">%R</div></td><td class="hintcell">Target subdirectory IN archive</td></tr>
168168
<tr><td class="varcell"><div class="firstcolumnaleft">{}</div></td><td class="hintcell">If some variable is enclosed in braces - it'll be added only if this variable will contain something non-empty</td></tr>
169169
<tr><td class="varcell"><div class="firstcolumnaleft">%S</div></td><td class="hintcell">Depends on modes, set in configuration dialog, MultiArc will ask user about additional command-line parameters should be passed in-place of %S</td></tr>

‎doc/en/variables.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ <h2>4. <a name="numsuffix">Numbered suffix</a></h2>
136136
<tr class="rowcategorytitle"><th colspan="2">Numbered suffix</th></tr>
137137
<tr class="rowsubtitle"><th class="namecolumn">Suffix</th><th class="categorydesccolumn">What it stands for</th></tr>
138138
<tr>
139-
<td class="varcell"><div class="firstcolumnaleft">0 <sup><acronym title="Requires Double Commander 0.9">[*]</acronym></sup></div></td>
139+
<td class="varcell"><div class="firstcolumnaleft">0</div></td>
140140
<td class="hintcell">The file under cursor<BR><code>Example: %ps0 = "C:\temp\FileY.txt"</code></td>
141141
</tr>
142142
<tr>

0 commit comments

Comments
 (0)