Fixed timeline widget and new docs.

docs/sphinx/en/user_docs/interface/interface.rst

@@ -32,6 +32,7 @@ F1            Toggle Topbar.
 F2            Toggle Pixel Toolbar.
 F3            Toggle Timeline Viewport and controls.
 Shift + F7    Toggle Drawing and Action Tools.
+e             Toggle Thumbnails (Edit) of Timeline.
 F11           Toggle Fullscreen mode.
 F12           Toggle Presentation mode (no toolbars).
 ============  =======================================
@@ -73,7 +74,9 @@ The Input Color Space is right next to it.  This is the OpenColorIO (OCIO) contr
 
 Coming next, is the view and display control of OpenColorIO (OCIO).
 
-Finally, the last control is the gama one which is driven by the slider and is toggled between two previous values with the "Y" button.
+The "L" button brings up the OpenColorIO Looks, which allow adding an artistic look to the image, besides the normal ACES workflow. 
+
+Finally, the last control is the gamma one which is driven by the slider and is toggled between two previous values with the "Y" button.
 
 .. note::
 
@@ -86,7 +89,7 @@ The Timeline
 .. image:: ../images/timeline-01.png
    :align: center
 
-The Timeline Viewport allows you to scale the Editing's Thumbnails and Audio waveforms by dragging the viewport up and down.  For a quick display of all the tracks, you can click on the Edit button in the Menu toolbar.
+The Timeline Viewport allows you to scale the Editing's Thumbnails and Audio waveforms by dragging the viewport up and down.  For a quick display of all the tracks, you can click on the Edit button (Shortcut 'e' by default) in the Menu toolbar.
 When showing the pictures, you can zoom in and out with the mousewheel.
 
 Frame Indicator
@@ -181,7 +184,7 @@ mrv2 supports Panels to organize the information logically.  These panels can be
 Divider
 +++++++
 
-The Panels have a divided, just like the Timeline Viewport, and can be dragged to make the panel bigger or smaller (and change the size of the main viewport).
+The Panels have a divider, just like the Timeline Viewport, and can be dragged to make the panel bigger or smaller (and change the size of the main viewport).
 
 
 

docs/sphinx/es/user_docs/interface/interface.rst

@@ -24,17 +24,18 @@ Ocultando/Mostrando Elementos de la GUI
 
 Algunas teclas útiles por defecto:
 
-============  =============================================
+============  ======================================================
 Tecla         Acción
-============  =============================================
+============  =====================================================
 Shift + F1    Alternar la barra de Menú.
 F1            Alternar la barra Superior.
 F2            Alternar la barra de Pixel.
 F3            Alternar la barra de Línea de Tiempo.
+e             Alternar los dibujos (edición) en la Línea de Tiempo.
 Shift + F7    Alternar las Herramientas de Dibujo y Acción.
 F11           Alternar el modo Pantalla Completa.
 F12           Alternar el modo Presentación (sin barras).
-============  =============================================
+============  =====================================================
 
 
 Personalizando la Interfaz
@@ -56,7 +57,7 @@ El factor de zoom actual es mostrado en la barra de pixel a la izquierda.
 
 .. note::
     Para 'centrar' la vista, sin cambiar el factor de zoom, puede usar la tecla
-    'h' hotkey.
+    'h' (Home en inglés).
 
 .. note::
    Si quiere acercase o alejarse un porcentaje particular (digamos 2x), puede
@@ -73,6 +74,8 @@ El Espacio de Entrada de Color está a su lado.  Este es el Control de OpenColor
 
 Junto a él, está el control de OpenColorIO (OCIO) del display y de la vista.
 
+El siguiente botón marcado con "L" es el controls de "Looks" de OpenColorIO (OCIO).  Permite agregar un look artístico a la imagen sobre el ya aplicado ACES, por ejemplo.
+
 Finalmente, el último control es el de gama que se controla con el deslizador y se alterna entre dos valores con el botón marcado con "Y".
 
 .. note::

mrv2/docs/HISTORY.md

@@ -1,3 +1,6 @@
+v0.9.4
+======
+
 v0.9.3
 ======
 

mrv2/docs/en/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 6b84fce7db26708425b4e03e6fa99cfa
+config: 48b784a9235c1c7a657c0806b86322e5
 tags: 645f666f9bcd5a90fca523b33c5a78b7

mrv2/docs/en/_sources/user_docs/interface/interface.rst.txt

@@ -32,6 +32,7 @@ F1            Toggle Topbar.
 F2            Toggle Pixel Toolbar.
 F3            Toggle Timeline Viewport and controls.
 Shift + F7    Toggle Drawing and Action Tools.
+e             Toggle Thumbnails (Edit) of Timeline.
 F11           Toggle Fullscreen mode.
 F12           Toggle Presentation mode (no toolbars).
 ============  =======================================
@@ -73,7 +74,9 @@ The Input Color Space is right next to it.  This is the OpenColorIO (OCIO) contr
 
 Coming next, is the view and display control of OpenColorIO (OCIO).
 
-Finally, the last control is the gama one which is driven by the slider and is toggled between two previous values with the "Y" button.
+The "L" button brings up the OpenColorIO Looks, which allow adding an artistic look to the image, besides the normal ACES workflow. 
+
+Finally, the last control is the gamma one which is driven by the slider and is toggled between two previous values with the "Y" button.
 
 .. note::
 
@@ -86,7 +89,7 @@ The Timeline
 .. image:: ../images/timeline-01.png
    :align: center
 
-The Timeline Viewport allows you to scale the Editing's Thumbnails and Audio waveforms by dragging the viewport up and down.  For a quick display of all the tracks, you can click on the Edit button in the Menu toolbar.
+The Timeline Viewport allows you to scale the Editing's Thumbnails and Audio waveforms by dragging the viewport up and down.  For a quick display of all the tracks, you can click on the Edit button (Shortcut 'e' by default) in the Menu toolbar.
 When showing the pictures, you can zoom in and out with the mousewheel.
 
 Frame Indicator
@@ -181,7 +184,7 @@ mrv2 supports Panels to organize the information logically.  These panels can be
 Divider
 +++++++
 
-The Panels have a divided, just like the Timeline Viewport, and can be dragged to make the panel bigger or smaller (and change the size of the main viewport).
+The Panels have a divider, just like the Timeline Viewport, and can be dragged to make the panel bigger or smaller (and change the size of the main viewport).
 
 
 

mrv2/docs/en/user_docs/interface/interface.html

@@ -143,10 +143,13 @@ <h2>Hiding/Showing UI elements<a class="headerlink" href="#hiding-showing-ui-ele
 <tr class="row-even"><td><p>Shift + F7</p></td>
 <td><p>Toggle Drawing and Action Tools.</p></td>
 </tr>
-<tr class="row-odd"><td><p>F11</p></td>
+<tr class="row-odd"><td><p>e</p></td>
+<td><p>Toggle Thumbnails (Edit) of Timeline.</p></td>
+</tr>
+<tr class="row-even"><td><p>F11</p></td>
 <td><p>Toggle Fullscreen mode.</p></td>
 </tr>
-<tr class="row-even"><td><p>F12</p></td>
+<tr class="row-odd"><td><p>F12</p></td>
 <td><p>Toggle Presentation mode (no toolbars).</p></td>
 </tr>
 </tbody>
@@ -182,7 +185,8 @@ <h2>The Top Bar<a class="headerlink" href="#the-top-bar" title="Link to this hea
 <p>The gain (controlled by the slider) and/or exposure, driven by the arrows and toggled by the button that shows the F-stop (f/8 by default).</p>
 <p>The Input Color Space is right next to it.  This is the OpenColorIO (OCIO) control of the image.</p>
 <p>Coming next, is the view and display control of OpenColorIO (OCIO).</p>
-<p>Finally, the last control is the gama one which is driven by the slider and is toggled between two previous values with the “Y” button.</p>
+<p>The “L” button brings up the OpenColorIO Looks, which allow adding an artistic look to the image, besides the normal ACES workflow.</p>
+<p>Finally, the last control is the gamma one which is driven by the slider and is toggled between two previous values with the “Y” button.</p>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
 <p>The OpenColorIO (OCIO) controls are derived from your configuration file, which is specified in <strong>Window-&gt;Preferences-&gt;OCIO</strong>.  By default, the OCIO configuration file used is the cg-config one.  mrv2 ships also with the nuke-default and with the studio-config ones.
@@ -192,7 +196,7 @@ <h2>The Top Bar<a class="headerlink" href="#the-top-bar" title="Link to this hea
 <section id="the-timeline">
 <h2>The Timeline<a class="headerlink" href="#the-timeline" title="Link to this heading"></a></h2>
 <img alt="../../_images/timeline-01.png" class="align-center" src="../../_images/timeline-01.png" />
-<p>The Timeline Viewport allows you to scale the Editing’s Thumbnails and Audio waveforms by dragging the viewport up and down.  For a quick display of all the tracks, you can click on the Edit button in the Menu toolbar.
+<p>The Timeline Viewport allows you to scale the Editing’s Thumbnails and Audio waveforms by dragging the viewport up and down.  For a quick display of all the tracks, you can click on the Edit button (Shortcut ‘e’ by default) in the Menu toolbar.
 When showing the pictures, you can zoom in and out with the mousewheel.</p>
 <section id="frame-indicator">
 <h3>Frame Indicator<a class="headerlink" href="#frame-indicator" title="Link to this heading"></a></h3>
@@ -286,7 +290,7 @@ <h2>The Panels<a class="headerlink" href="#the-panels" title="Link to this headi
 </section>
 <section id="divider">
 <h2>Divider<a class="headerlink" href="#divider" title="Link to this heading"></a></h2>
-<p>The Panels have a divided, just like the Timeline Viewport, and can be dragged to make the panel bigger or smaller (and change the size of the main viewport).</p>
+<p>The Panels have a divider, just like the Timeline Viewport, and can be dragged to make the panel bigger or smaller (and change the size of the main viewport).</p>
 </section>
 </section>
 

mrv2/docs/es/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 8ab837b3389525ba9e1b2cc987ad83f5
+config: 101fad38d0252a401dbdcd26cab017e7
 tags: 645f666f9bcd5a90fca523b33c5a78b7

mrv2/docs/es/_sources/user_docs/interface/interface.rst.txt

@@ -24,17 +24,18 @@ Ocultando/Mostrando Elementos de la GUI
 
 Algunas teclas útiles por defecto:
 
-============  =============================================
+============  ======================================================
 Tecla         Acción
-============  =============================================
+============  =====================================================
 Shift + F1    Alternar la barra de Menú.
 F1            Alternar la barra Superior.
 F2            Alternar la barra de Pixel.
 F3            Alternar la barra de Línea de Tiempo.
+e             Alternar los dibujos (edición) en la Línea de Tiempo.
 Shift + F7    Alternar las Herramientas de Dibujo y Acción.
 F11           Alternar el modo Pantalla Completa.
 F12           Alternar el modo Presentación (sin barras).
-============  =============================================
+============  =====================================================
 
 
 Personalizando la Interfaz
@@ -56,7 +57,7 @@ El factor de zoom actual es mostrado en la barra de pixel a la izquierda.
 
 .. note::
     Para 'centrar' la vista, sin cambiar el factor de zoom, puede usar la tecla
-    'h' hotkey.
+    'h' (Home en inglés).
 
 .. note::
    Si quiere acercase o alejarse un porcentaje particular (digamos 2x), puede
@@ -73,6 +74,8 @@ El Espacio de Entrada de Color está a su lado.  Este es el Control de OpenColor
 
 Junto a él, está el control de OpenColorIO (OCIO) del display y de la vista.
 
+El siguiente botón marcado con "L" es el controls de "Looks" de OpenColorIO (OCIO).  Permite agregar un look artístico a la imagen sobre el ya aplicado ACES, por ejemplo.
+
 Finalmente, el último control es el de gama que se controla con el deslizador y se alterna entre dos valores con el botón marcado con "Y".
 
 .. note::

mrv2/docs/es/user_docs/interface/interface.html

@@ -122,36 +122,15 @@
 <section id="ocultando-mostrando-elementos-de-la-gui">
 <h2>Ocultando/Mostrando Elementos de la GUI<a class="headerlink" href="#ocultando-mostrando-elementos-de-la-gui" title="Link to this heading"></a></h2>
 <p>Algunas teclas útiles por defecto:</p>
-<table class="docutils align-default">
-<thead>
-<tr class="row-odd"><th class="head"><p>Tecla</p></th>
-<th class="head"><p>Acción</p></th>
-</tr>
-</thead>
-<tbody>
-<tr class="row-even"><td><p>Shift + F1</p></td>
-<td><p>Alternar la barra de Menú.</p></td>
-</tr>
-<tr class="row-odd"><td><p>F1</p></td>
-<td><p>Alternar la barra Superior.</p></td>
-</tr>
-<tr class="row-even"><td><p>F2</p></td>
-<td><p>Alternar la barra de Pixel.</p></td>
-</tr>
-<tr class="row-odd"><td><p>F3</p></td>
-<td><p>Alternar la barra de Línea de Tiempo.</p></td>
-</tr>
-<tr class="row-even"><td><p>Shift + F7</p></td>
-<td><p>Alternar las Herramientas de Dibujo y Acción.</p></td>
-</tr>
-<tr class="row-odd"><td><p>F11</p></td>
-<td><p>Alternar el modo Pantalla Completa.</p></td>
-</tr>
-<tr class="row-even"><td><p>F12</p></td>
-<td><p>Alternar el modo Presentación (sin barras).</p></td>
-</tr>
-</tbody>
-</table>
+<p>Shift + F1    Alternar la barra de Menú.
+F1            Alternar la barra Superior.
+F2            Alternar la barra de Pixel.
+F3            Alternar la barra de Línea de Tiempo.
+e             Alternar los dibujos (edición) en la Línea de Tiempo.
+Shift + F7    Alternar las Herramientas de Dibujo y Acción.
+F11           Alternar el modo Pantalla Completa.
+F12           Alternar el modo Presentación (sin barras).
+============  =====================================================</p>
 <section id="personalizando-la-interfaz">
 <h3>Personalizando la Interfaz<a class="headerlink" href="#personalizando-la-interfaz" title="Link to this heading"></a></h3>
 <img alt="../../_images/interface-03.png" class="align-center" src="../../_images/interface-03.png" />
@@ -168,7 +147,7 @@ <h3>Interacción del Ratón en el Visor<a class="headerlink" href="#interaccion-
 <div class="admonition note">
 <p class="admonition-title">Nota</p>
 <p>Para “centrar” la vista, sin cambiar el factor de zoom, puede usar la tecla
-“h” hotkey.</p>
+“h” (Home en inglés).</p>
 </div>
 <div class="admonition note">
 <p class="admonition-title">Nota</p>
@@ -183,6 +162,7 @@ <h2>La Barra Superior<a class="headerlink" href="#la-barra-superior" title="Link
 <p>La ganancia (controlada con el deslizador) y/o exposición, manejada con las flechas y alternada con el botón que muestra el F-stop (f/8 por defecto).</p>
 <p>El Espacio de Entrada de Color está a su lado.  Este es el Control de OpenColorIO (OCIO) de la imágen.</p>
 <p>Junto a él, está el control de OpenColorIO (OCIO) del display y de la vista.</p>
+<p>El siguiente botón marcado con «L» es el controls de «Looks» de OpenColorIO (OCIO).  Permite agregar un look artístico a la imagen sobre el ya aplicado ACES, por ejemplo.</p>
 <p>Finalmente, el último control es el de gama que se controla con el deslizador y se alterna entre dos valores con el botón marcado con «Y».</p>
 <div class="admonition note">
 <p class="admonition-title">Nota</p>

mrv2/lib/mrvGL/mrvTimelineWidget.cpp

@@ -558,18 +558,20 @@ namespace mrv
     {
         TLRENDER_P();
 
-        Fl_Gl_Window::resize(X, Y, W, H);
-
-        const math::Box2i geometry(0, 0, _toUI(w()), _toUI(h()));
-        p.timelineWindow->setGeometry(geometry);
-
         const float devicePixelRatio = this->pixels_per_unit();
         ui::SizeHintEvent sizeHintEvent(
             p.style, p.iconLibrary, p.fontSystem, devicePixelRatio);
         _sizeHintEvent(p.timelineWindow, sizeHintEvent);
 
+        const math::Box2i geometry(0, 0, _toUI(W), _toUI(H));
+        p.timelineWindow->setGeometry(geometry);
+
+        _clipEvent(p.timelineWindow, geometry, false);
+
         p.vbo.reset();
         p.vao.reset();
+
+        Fl_Gl_Window::resize(X, Y, W, H);
     }
 
     void TimelineWidget::draw()