Skip to content

Commit

Permalink
Fix issue #2659: Help pages -> Appendix A. Shortcut keys
Browse files Browse the repository at this point in the history
  • Loading branch information
sdottaka committed Feb 26, 2025
1 parent e96a468 commit be6ab45
Show file tree
Hide file tree
Showing 5 changed files with 518 additions and 989 deletions.
242 changes: 42 additions & 200 deletions Docs/Manual/English/Shortcut_keys.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8"?>
<appendix id="Shortcut_keys">
<title>Shortcut keys<indexterm>
<primary>shortcut keys</primary>
Expand All @@ -7,6 +7,47 @@
<para>WinMerge includes most of the familiar shortcut keys commonly used in
other Windows applications.</para>

<table>
<title>General</title>

<tgroup cols="2">
<thead>
<row>
<entry>Keys</entry>

<entry>Function</entry>
</row>
</thead>

<tbody>
<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>Tab</keycap>
</keycombo></entry>

<entry>Switch to the next tab</entry>

</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>Shift</keycap>

<keycap>Tab</keycap>
</keycombo></entry>

<entry>Switch to the previous tab</entry>

</row>

</tbody>
</tgroup>
</table>

<table>
<title>Folder compare</title>

Expand Down Expand Up @@ -686,205 +727,6 @@
<entry>Clear all Bookmarks</entry>
</row>

<row>
<entry><keycombo>
<keycap>Alt</keycap>

<keycap>0</keycap>
</keycombo></entry>

<entry>Go to Bookmark 0</entry>
</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>0</keycap>
</keycombo></entry>

<entry>Toggle Bookmark 0</entry>
</row>

<row>
<entry><keycombo>
<keycap>Alt</keycap>

<keycap>1</keycap>
</keycombo></entry>

<entry>Go to Bookmark 1</entry>
</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>1</keycap>
</keycombo></entry>

<entry>Toggle Bookmark 1</entry>
</row>

<row>
<entry><keycombo>
<keycap>Alt</keycap>

<keycap>2</keycap>
</keycombo></entry>

<entry>Go to Bookmark 2</entry>
</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>2</keycap>
</keycombo></entry>

<entry>Toggle Bookmark 2</entry>
</row>

<row>
<entry><keycombo>
<keycap>Alt</keycap>

<keycap>3</keycap>
</keycombo></entry>

<entry>Go to Bookmark 3</entry>
</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>3</keycap>
</keycombo></entry>

<entry>Toggle Bookmark 3</entry>
</row>

<row>
<entry><keycombo>
<keycap>Alt</keycap>

<keycap>4</keycap>
</keycombo></entry>

<entry>Go to Bookmark 4</entry>
</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>4</keycap>
</keycombo></entry>

<entry>Toggle Bookmark 4</entry>
</row>

<row>
<entry><keycombo>
<keycap>Alt</keycap>

<keycap>5</keycap>
</keycombo></entry>

<entry>Go to Bookmark 5</entry>
</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>5</keycap>
</keycombo></entry>

<entry>Toggle Bookmark 5</entry>
</row>

<row>
<entry><keycombo>
<keycap>Alt</keycap>

<keycap>6</keycap>
</keycombo></entry>

<entry>Go to Bookmark 6</entry>
</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>6</keycap>
</keycombo></entry>

<entry>Toggle Bookmark 6</entry>
</row>

<row>
<entry><keycombo>
<keycap>Alt</keycap>

<keycap>7</keycap>
</keycombo></entry>

<entry>Go to Bookmark 7</entry>
</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>7</keycap>
</keycombo></entry>

<entry>Toggle Bookmark 7</entry>
</row>

<row>
<entry><keycombo>
<keycap>Alt</keycap>

<keycap>8</keycap>
</keycombo></entry>

<entry>Go to Bookmark 8</entry>
</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>8</keycap>
</keycombo></entry>

<entry>Toggle Bookmark 8</entry>
</row>

<row>
<entry><keycombo>
<keycap>Alt</keycap>

<keycap>9</keycap>
</keycombo></entry>

<entry>Go to Bookmark 9</entry>
</row>

<row>
<entry><keycombo>
<keycap>Ctrl</keycap>

<keycap>9</keycap>
</keycombo></entry>

<entry>Toggle Bookmark 9</entry>
</row>
</tbody>
</tgroup>
</table>
Expand Down
2 changes: 1 addition & 1 deletion Docs/Manual/Japanese/Compare_files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,7 @@ panes).</para>
</section>

<section id="Compare_files_syncpoints">
<title>Synchronization points<indexterm>
<title>同期ポイント<indexterm>
<primary>synchronization points</primary>
</indexterm></title>
<para>TBD</para>
Expand Down
Loading

0 comments on commit be6ab45

Please sign in to comment.