Skip to content

Commit 81dc21b

Browse files
authored
Merge pull request #281 from parasol-framework/test/filesystem
Broad changes
2 parents 688b36b + 692cddc commit 81dc21b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+316
-496
lines changed

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,6 @@ if (PARASOL_INSTALL)
557557
if (NOT DISABLE_SSL)
558558
install (DIRECTORY "${PROJECT_SOURCE_DIR}/data/ssl/" DESTINATION "config/ssl")
559559
endif ()
560-
install (DIRECTORY "${PROJECT_SOURCE_DIR}/data/users/" DESTINATION "config/users")
561560
if (NOT DISABLE_FONT)
562561
install (DIRECTORY "${PROJECT_SOURCE_DIR}/data/fonts/" DESTINATION "config/fonts")
563562
endif ()
@@ -571,7 +570,6 @@ if (PARASOL_INSTALL)
571570
if (NOT DISABLE_SSL)
572571
install (DIRECTORY "${PROJECT_SOURCE_DIR}/data/ssl" DESTINATION "${SHARE_TARGET}/config")
573572
endif ()
574-
install (DIRECTORY "${PROJECT_SOURCE_DIR}/data/users" DESTINATION "${SHARE_TARGET}/config")
575573
if (NOT DISABLE_FONT)
576574
install (DIRECTORY "${PROJECT_SOURCE_DIR}/data/fonts" DESTINATION "${SHARE_TARGET}/config")
577575
endif ()

data/users/associations.cfg

Lines changed: 0 additions & 195 deletions
This file was deleted.

data/users/filesystem.cfg

Lines changed: 0 additions & 8 deletions
This file was deleted.

data/users/locale.cfg

Lines changed: 0 additions & 12 deletions
This file was deleted.

docs/html/modules/classes/file.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<span class="glyphicon glyphicon-minus text-muted" data-toggle="tooltip" title="Not writeable"></span></td><th class="col-md-1">Icon</th><td class="col-md-1"><span class="text-nowrap">STRING</span></td><td>Returns an icon reference that is suitable for this file in the UI.</td></tr><tr class="no-hover"><td colspan="4" class="hiddenRow"><div id="fl-Icon" class="accordion-body collapse"><div class="doc-content" style="margin:20px">
4343
<p>This field returns the name of the best icon to use when representing the file to the user, for instance in a file list. The icon style is determined by analysing the File's <a data-toggle="tooltip" title="Specifies the location of a file or folder." href="#tf-Path">Path</a>.</p>
44-
<p>The resulting string is returned in the format <code>icons:category/name</code> and can be opened with the <a href="picture.html">Picture</a> class.</p>
44+
<p>The resulting string is returned in the format <code>icons:category/name</code> and will refer to an SVG file.</p>
4545
</div></div></td></tr><tr id="_" data-toggle="collapse" data-target="#fl-Link" class="clickable"><td class="col-md-1"><a id="tf-Link"></a><span class="glyphicon glyphicon-ok text-danger" data-toggle="tooltip" title="Functional read access"></span>
4646

4747
<span class="glyphicon glyphicon-ok text-danger" data-toggle="tooltip" title="Functional write access"></span></td><th class="col-md-1">Link</th><td class="col-md-1"><span class="text-nowrap">STRING</span></td><td>Returns the link path for symbolically linked files.</td></tr><tr class="no-hover"><td colspan="4" class="hiddenRow"><div id="fl-Link" class="accordion-body collapse"><div class="doc-content" style="margin:20px">

docs/html/modules/classes/metaclass.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@
8888

8989
<span class="glyphicon glyphicon-cog text-danger" data-toggle="tooltip" title="Immutable"></span></td><th class="col-md-1">Flags</th><td class="col-md-1"><span class="text-nowrap">CLF</span></td><td>Optional flag settings.</td></tr><tr class="no-hover"><td colspan="4" class="hiddenRow"><div id="fl-Flags" class="accordion-body collapse"><div class="doc-content" style="margin:20px">
9090
<table class="table"><thead><tr><th class="col-md-1">Name</th><th>Description</th></tr></thead><tbody><tr><th class="col-md-1">CLF::INHERIT_LOCAL</th><td>Inherit the functionality of local objects defined in the class spec.</td></tr><tr><th class="col-md-1">CLF::NO_OWNERSHIP</th><td>Objects created will not be tracked to the creating process, nor any parent object (<a href="core.html?page=SetOwner">SetOwner()</a> will not work either).</td></tr></tbody></table>
91+
</div></div></td></tr><tr id="_" data-toggle="collapse" data-target="#fl-Icon" class="clickable"><td class="col-md-1"><a id="tf-Icon"></a><span class="glyphicon glyphicon-minus text-muted" data-toggle="tooltip" title="Not readable"></span>
92+
 
93+
<span class="glyphicon glyphicon-minus text-muted" data-toggle="tooltip" title="Not writeable"></span></td><th class="col-md-1">Icon</th><td class="col-md-1"><span class="text-nowrap">CSTRING</span></td><td>Associates an icon with the file data for this class.</td></tr><tr class="no-hover"><td colspan="4" class="hiddenRow"><div id="fl-Icon" class="accordion-body collapse"><div class="doc-content" style="margin:20px">
94+
<p>Files that belong to a class can be associated with an icon that is declared in this field. The icon string format is <code>folder/icon</code>. Valid icons are available in the icon database.</p>
9195
</div></div></td></tr><tr id="_" data-toggle="collapse" data-target="#fl-Location" class="clickable"><td class="col-md-1"><a id="tf-Location"></a><span class="glyphicon glyphicon-ok text-success" data-toggle="tooltip" title="Direct read access"></span>
9296

9397
<span class="glyphicon glyphicon-minus text-muted" data-toggle="tooltip" title="Not writeable"></span></td><th class="col-md-1">Location</th><td class="col-md-1"><span class="text-nowrap">STRING</span></td><td>Returns the path from which the class binary is loaded.</td></tr><tr class="no-hover"><td colspan="4" class="hiddenRow"><div id="fl-Location" class="accordion-body collapse"><div class="doc-content" style="margin:20px">

0 commit comments

Comments
 (0)