Skip to content

Commit

Permalink
Docs: Outdent table code a bit
Browse files Browse the repository at this point in the history
  • Loading branch information
@ferdnyc
ferdnyc committed Feb 14, 2020
1 parent a56d8bc commit 846e82e
Show file tree
Hide file tree
Showing 7 changed files with 203 additions and 203 deletions.
54 changes: 27 additions & 27 deletions doc/animation.rst
View file
Expand Up @@ -32,17 +32,17 @@ Overview
.. image:: images/animation-overview.jpg

.. table::
:widths: 5 32

== ================== ============
# Name Description
== ================== ============
1 Green Property When the play-head is on a key frame, the property appears green
1 Blue Property When the play-head is on an interpolated value, the property appears blue
2 Value Slider Click and drag your mouse to adjust the value (this automatically creates a key frame if needed)
3 Play-head Position the play-head over a clip where you need a key frame
4 Key frame Markers Small green tick marks are drawn at all key frame positions (on a clip)
== ================== ============
:widths: 5 32

== ================== ============
# Name Description
== ================== ============
1 Green Property When the play-head is on a key frame, the property appears green
1 Blue Property When the play-head is on an interpolated value, the property appears blue
2 Value Slider Click and drag your mouse to adjust the value (this automatically creates a key frame if needed)
3 Play-head Position the play-head over a clip where you need a key frame
4 Key frame Markers Small green tick marks are drawn at all key frame positions (on a clip)
== ================== ============

Key Frames
----------
Expand All @@ -54,15 +54,15 @@ the properties again. All animations require at least 2 key frames, but can supp
To adjust the **interpolation mode**, right click on the small graph icon next to a property value.

.. table::
:widths: 12
:widths: 12

================== ============
Name Description
================== ============
Bézier Interpolated values use a quadratic curve, and ease-in and ease-out
Linear Interpolated values are calculated linear (each step value is equal)
Constant Interpolated values stay the same until the next key frame, and jump to the new value
================== ============
================== ============
Name Description
================== ============
Bézier Interpolated values use a quadratic curve, and ease-in and ease-out
Linear Interpolated values are calculated linear (each step value is equal)
Constant Interpolated values stay the same until the next key frame, and jump to the new value
================== ============

For more info on clip properties, see :ref:`clip_properties_ref`. For more info on preset animations, see :ref:`clip_presets_ref`.
For more info on creating key frames for location and scale, see :ref:`clip_transform_ref`.
Expand All @@ -89,12 +89,12 @@ and adjust the frame rate. Once you have set the correct frame rate, drag the an
.. image:: images/file-properties.jpg

.. table::
:widths: 5 25

== ==================== ============
# Name Description
== ==================== ============
1 File Properties Select an image sequence in the **Project Files** panel, right click and choose **File Properties**
2 Frame Rate Adjust the frame rate of the animation. Typically, hand-drawn animations use 12 frames per second.
== ==================== ============
:widths: 5 25

== ==================== ============
# Name Description
== ==================== ============
1 File Properties Select an image sequence in the **Project Files** panel, right click and choose **File Properties**
2 Frame Rate Adjust the frame rate of the animation. Typically, hand-drawn animations use 12 frames per second.
== ==================== ============

128 changes: 64 additions & 64 deletions doc/clips.rst
View file
Expand Up @@ -33,33 +33,33 @@ Overview
.. image:: images/clip-overview.jpg

.. table::
:widths: 5 10 35
== ================== ============
# Name Description
== ================== ============
1 Clip 1 A video clip
2 Transition A gradual fade transition between the 2 clips
3 Clip 2 An image clip
== ================== ============
:widths: 5 10 35

== ================== ============
# Name Description
== ================== ============
1 Clip 1 A video clip
2 Transition A gradual fade transition between the 2 clips
3 Clip 2 An image clip
== ================== ============

Cutting & Slicing
-----------------
OpenShot has many easy ways to adjust the start and end positions of a clip (otherwise known as cutting). The most common
method is simply grabbing the left (or right) edge of the clip and dragging. Here is a list of methods for cutting clips in OpenShot:

.. table::
:widths: 30
================== ============
Name Description
================== ============
Slice When the play-head (i.e. red playback line) is overlapping a clip, right click on the clip, and choose Slice
Slice All When the play-head is overlapping many clips, right click on the play-head, and choose Slice All (it will cut all intersecting clips)
Resizing Edge Mouse over the edge of a clip, and resize the edge
Split Dialog Right click on a file, and choose **Split Clip**. A dialog will appear which allows for creating lots of small cuts in a single video file.
Razor Tool The razor tool cuts a clip wherever you click, so be careful. Easy and dangerous.
================== ============
:widths: 30

================== ============
Name Description
================== ============
Slice When the play-head (i.e. red playback line) is overlapping a clip, right click on the clip, and choose Slice
Slice All When the play-head is overlapping many clips, right click on the play-head, and choose Slice All (it will cut all intersecting clips)
Resizing Edge Mouse over the edge of a clip, and resize the edge
Split Dialog Right click on a file, and choose **Split Clip**. A dialog will appear which allows for creating lots of small cuts in a single video file.
Razor Tool The razor tool cuts a clip wherever you click, so be careful. Easy and dangerous.
================== ============

Keep in mind that all of the above cutting methods also have :ref:`keyboard_shortcut_ref`, to save even more time.

Expand All @@ -73,25 +73,25 @@ These presets can be accessed by right clicking on a clip.
.. image:: images/clip-presets.jpg

.. table::
:widths: 20
================== ============
Name Description
================== ============
Fade Fade in or out a clip (often easier than using a transition)
Animate Zoom and slide a clip
Rotate Rotate or flip a video
Layout Make a video smaller or larger, and snap to any corner
Time Reverse and speed up or slow down video
Volume Fade in or out the volume for a clip
Separate Audio Create a clip for each audio track
Slice Cut the clip at the play-head position
Transform Enable transform mode
Display Show waveform or thumbnail for a clip
Properties Show the properties panel for a clip
Copy / Paste Copy and paste key frames or duplicate an entire clip (with all key frames)
Remove Clip Remove a clip from the timeline
================== ============
:widths: 20

================== ============
Name Description
================== ============
Fade Fade in or out a clip (often easier than using a transition)
Animate Zoom and slide a clip
Rotate Rotate or flip a video
Layout Make a video smaller or larger, and snap to any corner
Time Reverse and speed up or slow down video
Volume Fade in or out the volume for a clip
Separate Audio Create a clip for each audio track
Slice Cut the clip at the play-head position
Transform Enable transform mode
Display Show waveform or thumbnail for a clip
Properties Show the properties panel for a clip
Copy / Paste Copy and paste key frames or duplicate an entire clip (with all key frames)
Remove Clip Remove a clip from the timeline
================== ============

.. _clip_transform_ref:

Expand Down Expand Up @@ -124,30 +124,30 @@ close attention to where the play-head (i.e. red playback line) is. Key frames a
position, to help create animations.

.. table::
:widths: 20

================== ============
Name Description
================== ============
Gravity Type The gravity of a clip determines where it snaps to it's parent
Scale Type The scale determines how a clip should be resized to fit it's parent
Frame Display Type The format to display the frame number (if any)
Scale X Curve representing the horizontal scaling in percent (0 to 1)
Scale Y Curve representing the vertical scaling in percent (0 to 1)
Location X Curve representing the relative X position in percent based on the gravity (-1 to 1)
Location Y Curve representing the relative Y position in percent based on the gravity (-1 to 1)
Rotation Curve representing the rotation (0 to 360)
Alpha Curve representing the alpha (1 to 0)
Time Curve representing the frames over time to play (used for speed and direction of video)
Volume Curve representing the volume (0 to 1)
Shear X Curve representing X shear angle in degrees (-45.0=left, 45.0=right)
Shear Y Curve representing Y shear angle in degrees (-45.0=down, 45.0=up)
Channel Filter A number representing an audio channel to filter (clears all other channels)
Channel Mapping A number representing an audio channel to output (only works when filtering a channel)
Has Audio An optional override to determine if this clip has audio (-1=undefined, 0=no, 1=yes)
Has Video An optional override to determine if this clip has video (-1=undefined, 0=no, 1=yes)
Waveform Should a waveform be used instead of the clip's image
Waveform Color Curve representing the color of the audio wave form
================== ============
:widths: 20

================== ============
Name Description
================== ============
Gravity Type The gravity of a clip determines where it snaps to it's parent
Scale Type The scale determines how a clip should be resized to fit it's parent
Frame Display Type The format to display the frame number (if any)
Scale X Curve representing the horizontal scaling in percent (0 to 1)
Scale Y Curve representing the vertical scaling in percent (0 to 1)
Location X Curve representing the relative X position in percent based on the gravity (-1 to 1)
Location Y Curve representing the relative Y position in percent based on the gravity (-1 to 1)
Rotation Curve representing the rotation (0 to 360)
Alpha Curve representing the alpha (1 to 0)
Time Curve representing the frames over time to play (used for speed and direction of video)
Volume Curve representing the volume (0 to 1)
Shear X Curve representing X shear angle in degrees (-45.0=left, 45.0=right)
Shear Y Curve representing Y shear angle in degrees (-45.0=down, 45.0=up)
Channel Filter A number representing an audio channel to filter (clears all other channels)
Channel Mapping A number representing an audio channel to output (only works when filtering a channel)
Has Audio An optional override to determine if this clip has audio (-1=undefined, 0=no, 1=yes)
Has Video An optional override to determine if this clip has video (-1=undefined, 0=no, 1=yes)
Waveform Should a waveform be used instead of the clip's image
Waveform Color Curve representing the color of the audio wave form
================== ============

For more info on key frames and animation, see :ref:`animation_ref`.
76 changes: 38 additions & 38 deletions doc/files.rst
View file
Expand Up @@ -28,16 +28,16 @@ Import Files
There are many ways to import media files into OpenShot.

.. table::
:widths: 25
:widths: 25

==================== ============
Name Description
==================== ============
Drag and Drop Drag and drop the files from your file manager (file explorer, finder, etc...)
Right Click\→Import Right click in the **Project Files** panel, choose **Import Files...**
File Menu\→Import File menu\→Import Files...
Import Files Toolbar Click the **Import Files...** toolbar button (on the top menu)
==================== ============
==================== ============
Name Description
==================== ============
Drag and Drop Drag and drop the files from your file manager (file explorer, finder, etc...)
Right Click\→Import Right click in the **Project Files** panel, choose **Import Files...**
File Menu\→Import File menu\→Import Files...
Import Files Toolbar Click the **Import Files...** toolbar button (on the top menu)
==================== ============

.. image:: images/quick-start-drop-files.jpg

Expand Down Expand Up @@ -72,16 +72,16 @@ to repeat the steps for your next clip. When you are finished, simply close the
.. image:: images/file-split-dialog.jpg

.. table::
:widths: 5 20
:widths: 5 20

== ================== ============
# Name Description
== ================== ============
1 Start of Clip Choose the starting frame of your clip by clicking this button
2 End of Clip Choose the ending frame of your clip by clicking this button
3 Name of Clip Enter an optional name
4 Create Clip Create the clip (which resets this dialog, so you can repeat these steps for each clip)
== ================== ============
== ================== ============
# Name Description
== ================== ============
1 Start of Clip Choose the starting frame of your clip by clicking this button
2 End of Clip Choose the ending frame of your clip by clicking this button
3 Name of Clip Enter an optional name
4 Create Clip Create the clip (which resets this dialog, so you can repeat these steps for each clip)
== ================== ============

Add to Timeline
---------------
Expand All @@ -92,18 +92,18 @@ all files you need to add, right click, and choose Add to Timeline.
.. image:: images/file-add-to-timeline.jpg

.. table::
:widths: 5 28

== ================== ============
# Name Description
== ================== ============
1 Selected Files The list of selected files that need to be added to the timeline
2 Order of Files Use these buttons to reorder the list of files (move up, move down, randomize, remove)
3 Timeline Position Choose the starting position and track where these files need to be inserted on the timeline
4 Fade Options Fade in, fade out, both, or none
5 Zoom Options Zoom in, zoom out, or none
6 Transitions Choose a specific transition to use between files, random, or none
== ================== ============
:widths: 5 28

== ================== ============
# Name Description
== ================== ============
1 Selected Files The list of selected files that need to be added to the timeline
2 Order of Files Use these buttons to reorder the list of files (move up, move down, randomize, remove)
3 Timeline Position Choose the starting position and track where these files need to be inserted on the timeline
4 Fade Options Fade in, fade out, both, or none
5 Zoom Options Zoom in, zoom out, or none
6 Transitions Choose a specific transition to use between files, random, or none
== ================== ============

Properties
----------
Expand All @@ -114,12 +114,12 @@ This will launch the file properties dialog, which displays information about yo
.. image:: images/file-properties.jpg

.. table::
:widths: 5 24
== ==================== ============
# Name Description
== ==================== ============
1 File Properties Select an image sequence in the **Project Files** panel, right click and choose **File Properties**
2 Frame Rate For image sequences, you can also adjust the frame rate of the animation
== ==================== ============
:widths: 5 24

== ==================== ============
# Name Description
== ==================== ============
1 File Properties Select an image sequence in the **Project Files** panel, right click and choose **File Properties**
2 Frame Rate For image sequences, you can also adjust the frame rate of the animation
== ==================== ============

0 comments on commit 846e82e

Please sign in to comment.