Skip to content

Commit 839d510

Browse files
authored
Merge pull request #3 from visualdiffer/feat/missing-docs
Feat/missing docs
2 parents f77b9d0 + b797610 commit 839d510

126 files changed

Lines changed: 1491 additions & 285 deletions

File tree

Some content is hidden

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

.idea/.gitignore

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

.idea/modules.xml

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

.idea/vcs.xml

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

.idea/visualdiffer.github.com.iml

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

Gemfile.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ CHECKSUMS
8888
addressable (2.8.9)
8989
base64 (0.3.0)
9090
bigdecimal (4.0.1)
91-
bundler (4.0.11) sha256=5bcec0fb78302e48d02ee46f10ee6e6942be647ba5b44a6d1ddfda9a240ce785
9291
colorator (1.1.0)
9392
concurrent-ruby (1.3.5)
9493
csv (3.3.5)

README.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,28 @@
77

88
### Tailwind
99

10-
Generate the `CSS` every time styles on `input.css` change
10+
Regenerate the CSS whenever `input.css` changes.
1111

1212
npx @tailwindcss/cli -i ./css/input.css -o css/theme.css
1313

14+
### Images
15+
16+
Reduce image size
17+
18+
find img/screenshots -type file -name '*.png' -exec pngquant -f --ext .png --quality=65-80 {} \;
19+
20+
# Highlight rectangle
21+
22+
See [contextMenuExclude.png](img/screenshots/folder/fileFilters/contextMenuExclude.png) or [traverseFileFilters.png](img/screenshots/folder/fileFilters/traverseFileFilters.png)
23+
24+
To highlight a region in GIMP:
25+
26+
1. Use the Ellipse/Rectangle Select Tool
27+
2. Select the area you want to keep
28+
3. Select → Feather — e.g., 30–50px for soft edges
29+
4. Invert the selection — `Select → Invert`
30+
5. Darken the surrounding area — `Colors → Brightness-Contrast`, set Brightness to -127
31+
1432
# Local Test
1533

1634
### Generate documentation for the Apple Help system

_includes/finderMetadata.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The complete list of supported metadata
1919
<td>Compare all labels assigned to a file</td>
2020
</tr>
2121
<tr>
22-
<td>Tags<br/><strong>Available in macOS 10.9 or above</strong></td>
22+
<td>Tags</td>
2323
<td>Compare all tags assigned to a file</td>
2424
</tr>
2525
</tbody>

_includes/scripts.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@
2424
</script>
2525
{% endif %}
2626
{% endcase %}
27+
<script src="js/copy-cmd.js"></script>
2728

alignRules.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ This can be achieved using VisualDiffer 'user-defined alignment rules'.
142142

143143
You can create, edit or delete rules from Session Preferences Dialog
144144

145-
![image]({{ site.prefixDir }}img/ternaryop/vd/screenshots/wiki/sessionPrefAlignment.png)
145+
![image]({{ site.prefixDir }}img/screenshots/folder/align/main.png){:.wiki-img}
146146

147147
More rules can be assigned to a VisualDiffer session comparison; they are evaluated from top to bottom.
148148

149149
## [Creating a Rule](#creating_a_rule)
150150

151151
When you add a new rule (or edit an existing one) you access the dialog shown below
152152

153-
![image]({{ site.prefixDir }}img/ternaryop/vd/screenshots/wiki/alignRule.png)
153+
![image]({{ site.prefixDir }}img/screenshots/folder/align/rule.png){:.wiki-img}
154154

155155
A rule has
156156

@@ -199,7 +199,7 @@ Now if you save the rule and then run the comparison you obtain the result shown
199199

200200
But `002.jpg` and `002.RAW` files are not aligned because the `002.RAW` extension is uppercase; this can be easily fixed by ignoring the case on the right expression as shown in the figure below
201201

202-
![image]({{ site.prefixDir }}img/ternaryop/vd/screenshots/wiki/alignRuleIgnoreCase.png)
202+
![image]({{ site.prefixDir }}img/screenshots/folder/align/ruleIgnoreCase.png){:.wiki-img}
203203

204204
## [Test Rule](#test_rule)
205205

colorsLegend.md

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
---
2+
permalink: colorsLegend.html
3+
layout: default
4+
5+
# mainAnchor is used by Apple links
6+
mainAnchor: colorsLegend
7+
title: Colors Legend
8+
subtitle: Colors and icons used in folder and file comparison views
9+
---
10+
11+
# [Folder Colors](#folder_colors)
12+
13+
Folders are shown using different colors to quickly visualize the file comparison results.
14+
15+
<div class="folder-legend-grid">
16+
<div class="folder-legend-card">
17+
<img src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-000.png" alt="Matched folder">
18+
<strong>Matched</strong>
19+
<span>All files identical on both sides</span>
20+
</div>
21+
<div class="folder-legend-card">
22+
<img src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-001.png" alt="Has older files">
23+
<strong>Has older</strong>
24+
<span>Contains files older than the other side</span>
25+
</div>
26+
<div class="folder-legend-card">
27+
<img src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-010.png" alt="Modified files">
28+
<strong>Modified</strong>
29+
<span>Contains modified files</span>
30+
</div>
31+
<div class="folder-legend-card">
32+
<img src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-011.png" alt="Modified and older files">
33+
<strong>Modified + older</strong>
34+
<span>Contains modified files and files older than the other side</span>
35+
</div>
36+
<div class="folder-legend-card">
37+
<img src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-100.png" alt="Orphan folder">
38+
<strong>Orphan</strong>
39+
<span>Files only on one side</span>
40+
</div>
41+
<div class="folder-legend-card">
42+
<img src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-101.png" alt="Orphan and older files">
43+
<strong>Orphan + older</strong>
44+
<span>Orphan files and files older than the other side</span>
45+
</div>
46+
<div class="folder-legend-card">
47+
<img src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-110.png" alt="Orphan and modified files">
48+
<strong>Orphan + modified</strong>
49+
<span>Orphan files and modified files</span>
50+
</div>
51+
<div class="folder-legend-card">
52+
<img src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-999.png" alt="Filtered or empty folder">
53+
<strong>Filtered / Empty</strong>
54+
<span>Matches active <a href="fileFilters.html#show_filtered_files">file filters</a> or is empty</span>
55+
</div>
56+
</div>
57+
58+
# [File Colors](#file_colors)
59+
60+
Line colors in the File Differ View are based on differences found.
61+
62+
<div class="folder-legend-grid">
63+
<div class="folder-legend-card">
64+
<div class="file-legend-swatch file-legend-same"></div>
65+
<strong>Same</strong>
66+
<span>Left and right content is identical</span>
67+
</div>
68+
<div class="folder-legend-card">
69+
<div class="file-legend-swatch file-legend-different"></div>
70+
<strong>Different</strong>
71+
<span>Left content differs from right</span>
72+
</div>
73+
<div class="folder-legend-card">
74+
<div class="file-legend-swatch file-legend-missing-left"></div>
75+
<strong>Missing left</strong>
76+
<span>Line present only on the right; missing on the left</span>
77+
</div>
78+
<div class="folder-legend-card">
79+
<div class="file-legend-swatch file-legend-missing-right"></div>
80+
<strong>Missing right</strong>
81+
<span>Line present only on the left; missing on the right</span>
82+
</div>
83+
<div class="folder-legend-card">
84+
<div class="file-legend-swatch file-legend-merged"></div>
85+
<strong>Merged</strong>
86+
<span>Content copied from the other side; file is marked as edited</span>
87+
</div>
88+
</div>
89+
90+
# [Difference Indicator](#difference_indicator)
91+
92+
The narrow strip on the right side of the file diff view gives a bird's-eye view of all differences across the whole file.
93+
94+
![image]({{ site.prefixDir }}img/screenshots/file/differenceIndicator.png){:.wiki-img}
95+
96+
Each colored mark corresponds to a difference section; the colors match those in the diff table. The current scroll position is shown as a highlighted band. Click anywhere on the indicator to jump directly to that part of the file.

0 commit comments

Comments
 (0)