From: Paul Davis Date: Mon, 4 May 2015 12:09:10 +0000 (-0400) Subject: Merge branch 'hotguac-editprefs' X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e01dfac1e75cae37db79f24eb765f17aa1faecdf;hp=2f92b02fbb5cb72b3e4f0d2495428a18d6b51df2;p=ardour-manual Merge branch 'hotguac-editprefs' --- diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog.html index 2d90c8a..32529c8 100644 --- a/_manual/21_preferences-and-session-properties/01_preferences-dialog.html +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog.html @@ -4,7 +4,11 @@ title: Global Preferences Dialog menu_title: Global Preferences --- - -ardour preferences
+<p>
+  These preferences apply to all Ardour sessions.
+</p>
+
+<img src= +{% children %} diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/01_misc.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/01_misc.html new file mode 100644 index 0000000..0089089 --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/01_misc.html @@ -0,0 +1,149 @@ +--- +layout: default +title: Misc Tab +menu_title: Misc Tab +--- + +

+ This tab contains settings that do not belong on the other tabs. +

+ +preferences
+misc tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/02_transport.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/02_transport.html new file mode 100644 index 0000000..1d1f8fd --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/02_transport.html @@ -0,0 +1,177 @@ +--- +layout: default +title: Transport Tab +menu_title: Transport Tab +--- + +

+ This tab contains settings that relate to the behavior of the + Transport Bar + and Synchronization. +

+ +preferences
+transport tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/03_editor.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/03_editor.html new file mode 100644 index 0000000..ac32da7 --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/03_editor.html @@ -0,0 +1,152 @@ +--- +layout: default +title: Editor Tab +menu_title: Editor Tab +--- + +

+ This tab contains settings that affect behavior in the Editor + window when Editing and Arranging. +

+ +preferences
+editor tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/04_audio.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/04_audio.html new file mode 100644 index 0000000..2ff3615 --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/04_audio.html @@ -0,0 +1,152 @@ +--- +layout: default +title: Audio Tab +menu_title: Audio Tab +--- + +

+ This tab contains settings for handling audio. +

+ +preferences
+audio tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/05_solomute.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/05_solomute.html new file mode 100644 index 0000000..b6c0592 --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/05_solomute.html @@ -0,0 +1,103 @@ +--- +layout: default +title: Solo/Mute Tab +menu_title: Solo/Mute Tab +--- + +

+ This tab contains settings that affect the use of solo, muting, and panning. +

+ +preferences
+solo/mute tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/06_midi.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/06_midi.html new file mode 100644 index 0000000..97ecbab --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/06_midi.html @@ -0,0 +1,99 @@ +--- +layout: default +title: MIDI Tab +menu_title: MIDI Tab +--- + +

+ This tab contains settings related to the use of MIDI inside Ardour. +

+ +preferences
+MIDI tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/07_interaction.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/07_interaction.html new file mode 100644 index 0000000..95d5c99 --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/07_interaction.html @@ -0,0 +1,53 @@ +--- +layout: default +title: User Interaction Tab +menu_title: User Interaction Tab +--- + +

+ This tab contains settings that affect the user's interaction with + Ardours interface. +

+ +preferences
+user interaction tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/08_control_surfaces.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/08_control_surfaces.html new file mode 100644 index 0000000..57587e9 --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/08_control_surfaces.html @@ -0,0 +1,24 @@ +--- +layout: default +title: Control Surfaces Tab +menu_title: Control Surfaces Tab +--- + +

+ This tab contains settings for control surfaces. Also see + Using Control Surfaces. +

+ +preferences
+control surfaces tab + +

+ Enable a Control Surface Protocol and double-click on it to edit + protocol specific settings. Enable feedback to allow Ardour to send position + information back to a control surface. +

+ +

+ Control surface remote ID: can follow the order of the mixer + or be user assigned. +

diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/09_video.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/09_video.html new file mode 100644 index 0000000..edb50bb --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/09_video.html @@ -0,0 +1,42 @@ +--- +layout: default +title: Video Tab +menu_title: Video Tab +--- + +

+ This tab contains settings related to handling of Video. +

+ +preferences
+video tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/10_plugins.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/10_plugins.html new file mode 100644 index 0000000..522b773 --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/10_plugins.html @@ -0,0 +1,65 @@ +--- +layout: default +title: Plugins Tab +menu_title: Plugins Tab +--- + +

+ This tab contains settings that do not belong on the other tabs. +

+ +preferences
+plugins tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/11_gui.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/11_gui.html new file mode 100644 index 0000000..b0714db --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/11_gui.html @@ -0,0 +1,83 @@ +--- +layout: default +title: GUI Tab +menu_title: GUI Tab +--- + +

+ This tab contains settings that affect + Ardour's Interface. +

+ +preferences
+gui tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/12_metering.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/12_metering.html new file mode 100644 index 0000000..18c8114 --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/12_metering.html @@ -0,0 +1,50 @@ +--- +layout: default +title: Metering Tab +menu_title: Metering Tab +--- + +

+ This tab contains settings that affect the display and behavior of meters. +

+ +preferences
+metering tab + + diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/13_theme.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/13_theme.html new file mode 100644 index 0000000..3599ba3 --- /dev/null +++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/13_theme.html @@ -0,0 +1,87 @@ +--- +layout: default +title: Theme Tab +menu_title: Theme Tab +--- + +

+ This tab contains settings that change the visual appearence of Ardour. +

+ +preferences
+theme tab + + diff --git a/source/files/a4/a4_preferences_audio.png b/source/files/a4/a4_preferences_audio.png new file mode 100644 index 0000000..c6e16ed Binary files /dev/null and b/source/files/a4/a4_preferences_audio.png differ diff --git a/source/files/a4/a4_preferences_control_surfaces.png b/source/files/a4/a4_preferences_control_surfaces.png new file mode 100644 index 0000000..ab776eb Binary files /dev/null and b/source/files/a4/a4_preferences_control_surfaces.png differ diff --git a/source/files/a4/a4_preferences_editor.png b/source/files/a4/a4_preferences_editor.png new file mode 100644 index 0000000..af82d5e Binary files /dev/null and b/source/files/a4/a4_preferences_editor.png differ diff --git a/source/files/a4/a4_preferences_gui.png b/source/files/a4/a4_preferences_gui.png new file mode 100644 index 0000000..cc0531f Binary files /dev/null and b/source/files/a4/a4_preferences_gui.png differ diff --git a/source/files/a4/a4_preferences_interaction.png b/source/files/a4/a4_preferences_interaction.png new file mode 100644 index 0000000..96c5e51 Binary files /dev/null and b/source/files/a4/a4_preferences_interaction.png differ diff --git a/source/files/a4/a4_preferences_metering.png b/source/files/a4/a4_preferences_metering.png new file mode 100644 index 0000000..f65d22a Binary files /dev/null and b/source/files/a4/a4_preferences_metering.png differ diff --git a/source/files/a4/a4_preferences_midi.png b/source/files/a4/a4_preferences_midi.png new file mode 100644 index 0000000..6f4eec0 Binary files /dev/null and b/source/files/a4/a4_preferences_midi.png differ diff --git a/source/files/a4/a4_preferences_misc.png b/source/files/a4/a4_preferences_misc.png new file mode 100644 index 0000000..e6fd8ba Binary files /dev/null and b/source/files/a4/a4_preferences_misc.png differ diff --git a/source/files/a4/a4_preferences_plugins.png b/source/files/a4/a4_preferences_plugins.png new file mode 100644 index 0000000..1b96c5d Binary files /dev/null and b/source/files/a4/a4_preferences_plugins.png differ diff --git a/source/files/a4/a4_preferences_solomute.png b/source/files/a4/a4_preferences_solomute.png new file mode 100644 index 0000000..633640d Binary files /dev/null and b/source/files/a4/a4_preferences_solomute.png differ diff --git a/source/files/a4/a4_preferences_theme.png b/source/files/a4/a4_preferences_theme.png new file mode 100644 index 0000000..3039beb Binary files /dev/null and b/source/files/a4/a4_preferences_theme.png differ diff --git a/source/files/a4/a4_preferences_transport.png b/source/files/a4/a4_preferences_transport.png new file mode 100644 index 0000000..b446517 Binary files /dev/null and b/source/files/a4/a4_preferences_transport.png differ diff --git a/source/files/a4/a4_preferences_video.png b/source/files/a4/a4_preferences_video.png new file mode 100644 index 0000000..0e8d0b7 Binary files /dev/null and b/source/files/a4/a4_preferences_video.png differ