[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - 4 commits - loleaflet/css loleaflet/html loleaflet/images loleaflet/src

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Fri Dec 13 13:02:08 UTC 2019


 loleaflet/css/vex.css                              |   14 +++--
 loleaflet/html/loleaflet-help.html                 |   58 ++++++++++-----------
 loleaflet/images/help/en/area-dialog.png           |binary
 loleaflet/images/help/en/cell-comment.png          |binary
 loleaflet/images/help/en/chart-wizard.png          |binary
 loleaflet/images/help/en/data-validation.png       |binary
 loleaflet/images/help/en/information-bar.png       |binary
 loleaflet/images/help/en/insert-table.png          |binary
 loleaflet/images/help/en/manage-changes-filter.png |binary
 loleaflet/images/help/en/manage-changes.png        |binary
 loleaflet/images/help/en/page-style.png            |binary
 loleaflet/images/help/en/paragraph-dialog.png      |binary
 loleaflet/images/help/en/repair-document.png       |binary
 loleaflet/images/help/en/slide-layouts.png         |binary
 loleaflet/images/help/en/special-character.png     |binary
 loleaflet/images/help/en/status-bar.png            |binary
 loleaflet/images/help/en/thesaurus.png             |binary
 loleaflet/images/help/en/word-count.png            |binary
 loleaflet/src/control/Control.Toolbar.js           |    2 
 19 files changed, 41 insertions(+), 33 deletions(-)

New commits:
commit be3a03436730f1ea7c0d9c74135b3b611f5838c5
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Dec 13 13:17:06 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Dec 13 14:01:21 2019 +0100

    The uppercase SAVE thing is Android-only
    
    (See c6f36965cfc1bd68fdb88b01d493163b5d176bcc.)
    
    Avoid a mysterious and extremely misleading pop-up in the iOS app
    saying "The server encountered a unknown error while parsing the SAVE
    command".
    
    Change-Id: Ia9047f7dfa038864f3994002b42979062f0174d4
    Reviewed-on: https://gerrit.libreoffice.org/85105
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index 7c5586c3f..2cb0b5289 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -2149,7 +2149,7 @@ function onCommandResult(e) {
 			postMessageObj['result'] = e.result && e.result.value;
 		}
 
-		if (window.ThisIsAMobileApp) {
+		if (window.ThisIsTheAndroidApp) {
 			window.postMobileMessage('SAVE ' + JSON.stringify(postMessageObj));
 		} else {
 			map.fire('postMessage', {msgId: 'Action_Save_Resp', args: postMessageObj});
commit 5581ddcbdb1f594c27cc0d8059d04f645582d135
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Dec 13 13:19:36 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Dec 13 14:01:15 2019 +0100

    remove screenshot dimensions from help in order to avoid distorsions with updated/translated images
    
    Change-Id: I9aae794531b6e89ef463723c5c1b3202b37678d4

diff --git a/loleaflet/html/loleaflet-help.html b/loleaflet/html/loleaflet-help.html
index 6221cfe7a..99192f165 100644
--- a/loleaflet/html/loleaflet-help.html
+++ b/loleaflet/html/loleaflet-help.html
@@ -259,7 +259,7 @@
     <p><span class="def">Context menus:</span> On clicking with the right mouse button, a menu appears with commands associated with the underlying object.</p>
     <p><span class="def">The toolbar:</span> The toolbar contains the most used options for daily editing. Toolbar buttons are dynamic, meaning that their state (on or off) depends on different factors.</p>
     <p><span class="def">The status bar:</span> The status bar is shown in the bottom, and contains several useful options and features.</p>
-    <div class="screenshot"><img style="height:0.587cm;width:9.654cm;" alt="" src="images/help/en/status-bar.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/status-bar.png"/></div>
     <p><span class="def">The search bar:</span> Searching starts automatically when content is inserted in the search box, and the document window automatically moves to the first occurrence found. Searching is not case-sensitive. There are three buttons right next to the search box:</p>
     <ul>
       <li><p>Search backwards</p></li>
@@ -270,7 +270,7 @@
     <p>Text, charts, shapes and svg images will stay sharp, when zooming in, you will only see pixels appear at inserted images, such as jpg’s or png’s.</p>
     <p>Using the browser zoom affects the document and user interface areas.</p>
     <p><span class="def">The information bar:</span> At the right of the search bar, a set of information on the on the document is displayed. The actual information depends on the nature of the document.</p>
-    <div class="screenshot"><img style="height:0.6459cm;width:5.717cm;" alt="" src="images/help/en/information-bar.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/information-bar.png"/></div>
     <a id="1335"/>
     <h3>Opening, closing, saving, printing and downloading documents</h3>
     <p>Your documents are stored and managed in the cloud storage that is integrated with <span class="productname">%productName</span>.</p>
@@ -288,11 +288,11 @@
     <h4>Document repair</h4>
     <p>When multiple people edit the same document concurrently, it is possible for their changes to conflict and this can cause some confusion. The Document Repair function allows users to undo other editor’s changes to the document to a previous state.</p>
     <p>To jump back to the selected state, select it with the mouse and hit <span class="ui">Jump to state</span>.</p>
-    <div class="screenshot"><img style="height:2.967cm;width:6.2461cm;" alt="" src="images/help/en/repair-document.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/repair-document.png"/></div>
     <p>This is particularly useful – say when a colleague inadvertently selected all text in the document with <span class="kbd">Ctrl</span> + <span class="kbd">A</span> and proceeded to type over it destroying it – while you were concurrently editing.</p>
     <h4>Inactive document</h4>
     <p>When <span class="productname">%productName</span> detects that there has not been any activity in the browser for a while, it puts the document in an “Inactive” state. The document is shown with a transparent gray overlay, with the message “Inactive document – please click to resume editing”.</p>
-    <div class="screenshot"><img style="height:2.9261cm;width:8.368cm;" alt="" src="images/help/en/inactive-document.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/inactive-document.png"/></div>
     <p>To continue editing, click on the document and the layover and message disappear. Any changes that may have been made by other users – while collaboratively editing the document – are re-loaded.</p>
     <h4>Pasting</h4>
     <p>When you paste content copied from within the same document, the format and elements are maintained. If you copy from another document, in another tab or browser window, of from outside of the browser, the pasted content will preserve rich text.</p>
@@ -308,11 +308,11 @@
       <li><p>Select a table in text document, a range in a spreadsheet or a table in a presentation.</p></li>
       <li>
         <p>Choose <span class="ui">Insert</span> → <span class="ui">Charts</span>. Customize your chart on the sidebar:</p>
-        <div class="screenshot"><img style="height:7.2639cm;width:15.399cm;" alt="" src="images/help/en/chart-wizard.png"/></div>
+        <div class="screenshot"><img alt="" src="images/help/en/chart-wizard.png"/></div>
       </li>
       <li><p>If no table or range was selected, a prototype chart is displayed.</p></li>
     </ol>
-    <div class="screenshot"><img style="height:6.352cm;width:10.9979cm;" alt="" src="images/help/en/chart.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/chart.png"/></div>
     <p><span class="def">Chart editing:</span> Double click the chart to select. Use context menus to add chart elements such as title, axis, and other. Choose <span class="ui">Data Range</span> and <span class="ui">Chart Type</span> to edit chart data and select chart type.</p>
     <p><span class="def">Chart formatting:</span> The same context menu brings you to chart data table and chart type selection.</p>
     <p><span class="def">Data series formatting:</span> Open the context menu and choose <span class="ui">Format data series</span>.</p>
@@ -323,11 +323,11 @@
     <p>Images can be resized, rotated and anchored. Text can be wrapped around the image. Select the image and open the context menu. Use the images handles to resize the image with the mouse.</p>
     <h4>Comments in documents</h4>
     <p>Insert comments in <span class="productname">%productName</span> in places that need special reader attention. Comments are displayed on the right and carry the name and date of the issuer.</p>
-    <div class="screenshot"><img style="height:1.683cm;width:4.969cm;" alt="" src="images/help/en/comment.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/comment.png"/></div>
     <p>Click on the submenu (<img style="height:0.6cm;width:0.6cm;" alt="" src="images/submenu.svg">) icon to reply, move and delete comments.</p>
     <h4>Spellchecking</h4>
     <p><span class="productname">%productName</span> can check spelling in text documents, spreadsheets and presentations. A red wavy underline indicates misspelled words. Click on the right mouse button to open a context menu with suggested misspelling corrections.</p>
-    <div class="screenshot"><img style="height:0.6561cm;width:4.9479cm;" alt="" src="images/help/en/red-wavy-underline.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/red-wavy-underline.png"/></div>
     <p>To systematically spell-check the whole document use the <span class="ui">Tools</span> menu’s <span class="ui">Spelling</span> option.</p>
 <div class="spreadsheet" style="display: none;">
     <a id="1359"/>
@@ -339,12 +339,12 @@
     <h3>Formulas</h3>
     <p>Formulas are entered in the formula bar. Enter '=' and insert the formula.</p>
     <p>All spreadsheets functions and mathematical rules applies.</p>
-    <div class="screenshot"><img style="height:0.73cm;width:6.0429cm;" alt="" src="images/help/en/formula-bar.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/formula-bar.png"/></div>
     <p>The formula language should be extremely familiar to any spreadsheet user, and is specified in great detail in the <a href="https://www.oasis-open.org/committees/download.php/16826/openformula-spec-20060221.html">OASIS OpenFormula specification</a>.</p>
     <a id="1367"/>
     <h3>Formatting spreadsheets</h3>
     <p><span class="def">Direct formatting:</span> You can format spreadsheets cells, columns, rows and sheets by formatting directly from the menus, toolbar or context menus. Direct formatting applies only to the current object selected. To format a cell either use the menu or hit <span class="kbd">Ctrl</span> + <span class="kbd">1</span>. The dialog allows complex and custom number formatting, as well as font, complex border, background, cell protection and other options.</p>
-    <div class="screenshot"><img style="height:9.285cm;width:13.1889cm;" alt="" src="images/help/en/format-cells.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/format-cells.png"/></div>
     <a id="1371"/>
     <h3>Advanced features</h3>
     <p><span class="def">Sorting data:</span> You can sort a list of numbers or text ascending or descending. <span class="productname">%productName</span> automatically detects cells that are headers, and adjoining columns, to extend the selection.</p>
@@ -352,30 +352,30 @@
     <ol>
       <li>
          <p>One use for the <span class="ui">AutoFilter</span> function is to quickly restrict the display to records with identical entries in a data field.</p>
-         <div class="screenshot"><img style="height:9.312900000000001cm;width:11.1991cm;" alt="" src="images/help/en/autofilter.png"/></div>
+         <div class="screenshot"><img alt="" src="images/help/en/autofilter.png"/></div>
       </li>
       <li><p>In the <span class="ui">Standard Filter</span> dialog, you can also define ranges which contain the values in particular data fields. You can use the standard filter to connect the conditions with either a logical AND or a logical OR operator.</p></li>
       <li><p>The <span class="ui">Advanced Filter</span> allows up to a total of eight filter conditions. With advanced filters you enter the conditions directly into the sheet.</p></li>
     </ol>
     <p><span class="def">Outlining:</span> You can create an outline of your data and group rows and columns together so that you can collapse and expand the groups with a single click making it easy to represent hierarchical data.</p>
-    <div class="screenshot"><img style="height:3.8651cm;width:6.6799cm;" alt="" src="images/help/en/outlining.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/outlining.png"/></div>
     <p><span class="def">Data validation:</span> For each cell, you can define entries to be valid. Invalid entries to a cell will be rejected. To enable data validation:</p>
     <ol>
       <li>
         <p>Choose <span class="ui">Validity</span> from the <span class="ui">Data</span> menu. The <span class="ui">Validity</span> dialog opens.</p>
-        <div class="screenshot"><img style="height:9.011900000000001cm;width:13cm;" alt="" src="images/help/en/data-validation.png"/></div>
+        <div class="screenshot"><img alt="" src="images/help/en/data-validation.png"/></div>
       </li>
       <li><p>Select the validity criterion in the <span class="ui">Allow</span> drop-box list. Depending on the criterion, more options shows. Fill the required data.</p></li>
       <li>
         <p>Use the <span class="ui">Input Help</span> and <span class="ui">Error Alert</span> tabs to enhance the user interactions. Click <span class="ui">OK</span> to close the dialog.</p>
-        <div class="screenshot"><img style="height:4.651cm;width:2.6091cm;" alt="" src="images/help/en/selection-list.png"/></div>
+        <div class="screenshot"><img alt="" src="images/help/en/selection-list.png"/></div>
       </li>
       <li><p>To remove the validity of the cell, open the dialog and set the <span class="ui">Allow</span> list to “All values”.</p></li>
     </ol>
     <p>i<span class="def">Comments:</span> In a spreadsheet you can insert one comment per cell. When you select <span class="ui">Insert comment</span>, a popup appears that allows you to write the content for the comment. A red dot shows on the top right corner of the cell when it has a comment. Hover the mouse on the cell to display comments.</p>
-    <div class="screenshot"><img style="height:3.3371cm;width:4.9779cm;" alt="" src="images/help/en/cell-comment.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/cell-comment.png"/></div>
     <p><span class="def">Conditional formatting:</span> <span class="productname">%productName</span> adds symbols to each cell of a range based on cells conditions. Select the cell range and click the <span class="ui">Conditional Formatting</span> icon on the toolbar. Select the symbol set to apply on the range.</p>
-    <div class="screenshot"><img style="height:6.824cm;width:8.0419cm;" alt="" src="images/help/en/conditional-formatting.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/conditional-formatting.png"/></div>
 </div>
 <div class="text" style="display: none;">
     <a id="1373"/>
@@ -392,16 +392,16 @@
     <p>In contrast, direct formatting applies formatting to selected excerpts of the document contents. On a long document, direct formatting must be applied in every text excerpt, turning text formatting a long task, subject to errors and delays.</p>
     <p><span class="def">Direct formatting:</span> You can format text document objects by formatting directly from the menus, toolbar or context menus. Direct formatting applies only to the current object selected.</p>
     <p><span class="def">Style formatting:</span> <span class="productname">%productName</span> support paragraph styles. You can apply an existing paragraph style to a paragraph. Choose menu <span class="ui">Edit</span> → <span class="ui">Edit styles</span> to change style.</p>
-    <div class="screenshot"><img style="height:9.930899999999999cm;width:13.238cm;" alt="" src="images/help/en/paragraph-dialog.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/paragraph-dialog.png"/></div>
     <a id="1383"/>
     <h3>Advanced text document editor features</h3>
     <h4>Handling Tables</h4>
     <p>Insert tables with proper icon in the toolbar. Select the initial number of rows and columns. Add rows and columns with the cell context menu. Merge cells with the <span class="ui">Table</span> menu. The default paragraph style inside cells is “Table contents”.</p>
-    <div class="screenshot"><img style="height:6.0081cm;width:5.1471cm;" alt="" src="images/help/en/insert-table.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/insert-table.png"/></div>
     <p><span class="def">Formatting cells:</span> Click in the cell or range of cells and choose menu <span class="ui">Table</span> → <span class="ui">Properties</span>. Fine tune the table with the properties dialog.</p>
     <h4>Track changes</h4>
     <p>When you turn on Track Changes, <span class="productname">%productName</span> marks up new changes made to the document. Select this option again to turn it off.</p>
-    <div class="screenshot"><img style="height:1.859cm;width:5.1811cm;" alt="" src="images/help/en/track-changes-comment.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/track-changes-comment.png"/></div>
     <p>Changes made by different people are shown in different colors and each tracked change can be accepted or rejected, using the box the appears on the right. You can also add a comment there.</p>
     <h4>Other advanced features</h4>
     <p><span class="def">Comments:</span> Comments are inserted in the text and displayed on the right side of the screen.</p>
@@ -428,7 +428,7 @@
     <a id="1401"/>
     <h3>Advanced features</h3>
     <p><span class="def">Slide layouts:</span> <span class="productname">%productName</span> Impress let you change the slide layout. Select the desired slide layout in the drop-down layout list.</p>
-    <div class="screenshot"><img style="height:5.1719cm;width:3.1699cm;" alt="" src="images/help/en/slide-layouts.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/slide-layouts.png"/></div>
     <p><span class="def">Master slide:</span> Select the master slide associated to the current slide. Format and arrange slide elements in the master slide.</p>
     <p><span class="def">Slide transitions:</span> <span class="productname">%productName</span> Impress provides visual effects when displaying a new slide in the slide show. Slide transitions are property of the slide, use the side bar to set the slide transition when in edit mode.</p>
     <p><span class="def">Object animation:</span> Individual object in the slide can have animation. Use the side bar to configure the slide transition for a selected object or set of objects.</p>
@@ -462,7 +462,7 @@
     <p>Grammar errors in the text is marked with the blue wavy underline. Click on the underlined text with the right mouse button to open a menu with suggestions to correct the grammar error and the offending grammar rules. Select the right suggestion to change the text.</p>
     <h4>Is here a thesaurus?</h4>
     <p>Yes. Click in the word you want and choose <span class="ui">Tools</span> → <span class="ui">Thesaurus</span>. A dialog opens with many suggestions for replacements.</p>
-    <div class="screenshot"><img style="height:9.509cm;width:9.5291cm;" alt="" src="images/help/en/thesaurus.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/thesaurus.png"/></div>
     <h4>What are the blue <span class="blue">¶</span> symbol and how can I remove from my text document?</h4>
     <p>The <span class="blue">¶</span> symbol is a formatting mark. It is used to help text alignment and editing and is not printed. To toggle it in the document display, choose menu <span class="ui">View</span> → <span class="ui">Formatting mark</span>.</p>
 <div class="text" style="display: none;">
@@ -470,7 +470,7 @@
     <h3>Text documents</h3>
     <h4>How do I get a word count of my document?</h4>
     <p>Word count is available in <span class="ui">Tools</span> → <span class="ui">Word count</span>. A dialog shows word counts for selection and for the whole document.</p>
-    <div class="screenshot"><img style="height:3.842cm;width:8.3269cm;" alt="" src="images/help/en/word-count.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/word-count.png"/></div>
     <p>Word count is also displayed in the status bar. If no text is selected the word count is for the whole document. Otherwise the word count is for the selected text.</p>
     <h4>How can I insert a currency, copyright or trademark symbol in the document?</h4>
     <p>You can insert these special characters in the document using the <span class="ui">Special Character</span> dialog.</p>
@@ -478,7 +478,7 @@
       <li><p>Place the cursor in the position to insert the character.</p></li>
       <li>
         <p>Choose <span class="ui">Insert</span> → <span class="ui">Special Characters </span> or click the corresponding icon in the toolbar. A dialog shows.</p>
-        <div class="screenshot"><img style="height:8.2761cm;width:11.9639cm;" alt="" src="images/help/en/special-character.png"/></div>
+        <div class="screenshot"><img alt="" src="images/help/en/special-character.png"/></div>
       </li>
       <li><p>You can either browse the characters displayed with the drop lists or type a search key in the <span class="ui">Search</span> box. If you know the Unicode numeric code of the special character, enter in the boxes on the right.</p></li>
       <li><p>Press <span class="ui">Insert</span> button. To close the dialog, press <span class="ui">Cancel</span>.</p></li>
@@ -492,11 +492,11 @@
       <li><p>All changes are marked with a vertical bar in the right margin.</p></li>
       <li><p>Changes are displayed as comment in the right of the document area.</p></li>
     </ul>
-    <div class="screenshot"><img style="height:1.889cm;width:5.4201cm;" alt="" src="images/help/en/track-changes-comment.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/track-changes-comment.png"/></div>
     <p>The color assigned to the changes depends on the user that changes the document.</p>
     <p>To display or hide track changes choose <span class="ui">Edit</span> → <span class="ui">Track Changes </span> → <span class="ui">Show</span>. Beware that if track changes are enabled but hidden, you still record changes and may inadvertently leave unwanted text available in the document.</p>
     <p>Changes can be accepted or rejected. To accept or reject changes, click on the corresponding icons in the comment box on the right of the document. Alternatively, choose <span class="ui">Edit</span> → <span class="ui">Track Changes </span> → <span class="ui">Accept</span> or <span class="ui">Reject</span>. Furthermore, if you need to filter changes before accepting or rejecting, choose <span class="ui">Edit</span> → <span class="ui">Track Changes </span> → <span class="ui">Manage</span>. A dialog shows a list of all tracked changes. Use the dialog buttons accordingly.</p>
-    <div class="screenshot"><img style="height:8.301cm;width:10.1161cm;" alt="" src="images/help/en/manage-changes.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/manage-changes.png"/></div>
     <h4>How do I set the margins of the document?</h4>
     <p>Using the ruler drag the leftmost edge of the ruler to adjust the left margin, or the rightmost for the right margin.</p>
     <p>Using the page style</p>
@@ -504,7 +504,7 @@
       <li><p>Choose <span class="ui">Format</span> → <span class="ui">Page</span> and select the <span class="ui">Page</span> tab</p></li>
       <li><p>Set the page margins in the dialog.</p></li>
     </ol>
-    <div class="screenshot"><img style="height:9.731cm;width:13.4869cm;" alt="" src="images/help/en/page-style.png"/></div>
+    <div class="screenshot"><img alt="" src="images/help/en/page-style.png"/></div>
     <h4>How do I change the page orientation to landscape inside my document</h4>
     <ol>
       <li><p>Place the cursor at the place where the page orientation is to change. Add an empty paragraph.</p></li>
@@ -540,7 +540,7 @@
       <li><p>Activate the <span class="productname">%productName</span> spreadsheet window.</p></li>
       <li>
         <p>Paste from the browser <span class="ui">Edit</span> → <span class="ui">Paste</span> or press <span class="kbd">Ctrl</span> + <span class="kbd">V</span>. The <span class="ui">Text Import</span> dialog opens to let you describe the precise format of the CSV data.</p>
-        <div class="screenshot"><img style="height:10.4259cm;width:10.5921cm;" alt="" src="images/help/en/text-import.png"/></div>
+        <div class="screenshot"><img alt="" src="images/help/en/text-import.png"/></div>
       </li>
       <li><p>Select the character set, language and separator options for the CSV file.</p></li>
     </ol>
@@ -570,7 +570,7 @@
       <li><p>Select the shape in your slide. A set of handles shows.</p></li>
       <li>
         <p>Choose <span class="ui">Format</span> → <span class="ui">Line</span> (or <span class="ui">Area</span>, or <span class="ui">Position and Size</span>). A dialog opens.</p>
-        <div class="screenshot"><img style="height:9.4559cm;width:13.227cm;" alt="" src="images/help/en/area-dialog.png"/></div>
+        <div class="screenshot"><img alt="" src="images/help/en/area-dialog.png"/></div>
       </li>
       <li><p>Set the properties of the element of the object.</p></li>
     </ol>
commit ef2ed76af0653c94d0f870e16c475212d236c7fd
Author:     Pedro Pinto Silva <pedro.silva at collabora.com>
AuthorDate: Fri Dec 13 12:56:13 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Dec 13 14:01:05 2019 +0100

    Fix help text and add updated screenshots
    
    Change-Id: Ie7fe56ae1a9db2de04706712a3a16a70bcf394f0
    Reviewed-on: https://gerrit.libreoffice.org/85103
    Reviewed-by: Pedro Pinto da Silva <pedro.silva at collabora.com>
    Tested-by: Pedro Pinto da Silva <pedro.silva at collabora.com>

diff --git a/loleaflet/html/loleaflet-help.html b/loleaflet/html/loleaflet-help.html
index 0a79367b8..6221cfe7a 100644
--- a/loleaflet/html/loleaflet-help.html
+++ b/loleaflet/html/loleaflet-help.html
@@ -307,7 +307,7 @@
     <ol>
       <li><p>Select a table in text document, a range in a spreadsheet or a table in a presentation.</p></li>
       <li>
-        <p>Choose <span class="ui">Insert</span> → <span class="ui">Charts</span>. Follow the chart wizard to customize the chart.</p>
+        <p>Choose <span class="ui">Insert</span> → <span class="ui">Charts</span>. Customize your chart on the sidebar:</p>
         <div class="screenshot"><img style="height:7.2639cm;width:15.399cm;" alt="" src="images/help/en/chart-wizard.png"/></div>
       </li>
       <li><p>If no table or range was selected, a prototype chart is displayed.</p></li>
diff --git a/loleaflet/images/help/en/area-dialog.png b/loleaflet/images/help/en/area-dialog.png
index 5394f9044..89c285d91 100644
Binary files a/loleaflet/images/help/en/area-dialog.png and b/loleaflet/images/help/en/area-dialog.png differ
diff --git a/loleaflet/images/help/en/cell-comment.png b/loleaflet/images/help/en/cell-comment.png
index e59d8f6e7..54585023b 100644
Binary files a/loleaflet/images/help/en/cell-comment.png and b/loleaflet/images/help/en/cell-comment.png differ
diff --git a/loleaflet/images/help/en/chart-wizard.png b/loleaflet/images/help/en/chart-wizard.png
index f3c4333dc..5a6f62ee6 100644
Binary files a/loleaflet/images/help/en/chart-wizard.png and b/loleaflet/images/help/en/chart-wizard.png differ
diff --git a/loleaflet/images/help/en/data-validation.png b/loleaflet/images/help/en/data-validation.png
index 765e32302..3bb22bafa 100644
Binary files a/loleaflet/images/help/en/data-validation.png and b/loleaflet/images/help/en/data-validation.png differ
diff --git a/loleaflet/images/help/en/information-bar.png b/loleaflet/images/help/en/information-bar.png
index 6998fec9e..e72564d81 100644
Binary files a/loleaflet/images/help/en/information-bar.png and b/loleaflet/images/help/en/information-bar.png differ
diff --git a/loleaflet/images/help/en/insert-table.png b/loleaflet/images/help/en/insert-table.png
index 0b770c484..c0157607c 100644
Binary files a/loleaflet/images/help/en/insert-table.png and b/loleaflet/images/help/en/insert-table.png differ
diff --git a/loleaflet/images/help/en/manage-changes-filter.png b/loleaflet/images/help/en/manage-changes-filter.png
new file mode 100644
index 000000000..dd15f2922
Binary files /dev/null and b/loleaflet/images/help/en/manage-changes-filter.png differ
diff --git a/loleaflet/images/help/en/manage-changes.png b/loleaflet/images/help/en/manage-changes.png
index 245ce0bfd..9f6b2c107 100644
Binary files a/loleaflet/images/help/en/manage-changes.png and b/loleaflet/images/help/en/manage-changes.png differ
diff --git a/loleaflet/images/help/en/page-style.png b/loleaflet/images/help/en/page-style.png
index 7fc259bcc..498e4a4f6 100644
Binary files a/loleaflet/images/help/en/page-style.png and b/loleaflet/images/help/en/page-style.png differ
diff --git a/loleaflet/images/help/en/paragraph-dialog.png b/loleaflet/images/help/en/paragraph-dialog.png
index 87da1eafd..a14f9a611 100644
Binary files a/loleaflet/images/help/en/paragraph-dialog.png and b/loleaflet/images/help/en/paragraph-dialog.png differ
diff --git a/loleaflet/images/help/en/repair-document.png b/loleaflet/images/help/en/repair-document.png
index 13e964372..a416c89b7 100644
Binary files a/loleaflet/images/help/en/repair-document.png and b/loleaflet/images/help/en/repair-document.png differ
diff --git a/loleaflet/images/help/en/slide-layouts.png b/loleaflet/images/help/en/slide-layouts.png
index 951008897..1d01a3d7a 100644
Binary files a/loleaflet/images/help/en/slide-layouts.png and b/loleaflet/images/help/en/slide-layouts.png differ
diff --git a/loleaflet/images/help/en/special-character.png b/loleaflet/images/help/en/special-character.png
index a83f8ec1c..d79e667ac 100644
Binary files a/loleaflet/images/help/en/special-character.png and b/loleaflet/images/help/en/special-character.png differ
diff --git a/loleaflet/images/help/en/status-bar.png b/loleaflet/images/help/en/status-bar.png
index 3a5e31ac7..e02d5306d 100644
Binary files a/loleaflet/images/help/en/status-bar.png and b/loleaflet/images/help/en/status-bar.png differ
diff --git a/loleaflet/images/help/en/thesaurus.png b/loleaflet/images/help/en/thesaurus.png
index 3dd21e834..385419b3a 100644
Binary files a/loleaflet/images/help/en/thesaurus.png and b/loleaflet/images/help/en/thesaurus.png differ
diff --git a/loleaflet/images/help/en/word-count.png b/loleaflet/images/help/en/word-count.png
index 7a9c035ed..4bec2fbdf 100644
Binary files a/loleaflet/images/help/en/word-count.png and b/loleaflet/images/help/en/word-count.png differ
commit 1f9aadb39e6e7eebf3e20dedc4e09d2382f310b7
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Thu Dec 12 05:23:47 2019 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Dec 13 14:00:46 2019 +0100

    Resolved: Keyboard shortcut help window won't scroll
    
    Help usually don't fit in the resulting popup window,
    but wasn't possible to scroll.
    
    Change-Id: Iff14620730ba9cee6e679e4b6b69e84342019cd1
    Reviewed-on: https://gerrit.libreoffice.org/84998
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/css/vex.css b/loleaflet/css/vex.css
index ec9b7a67b..dc7a9d660 100644
--- a/loleaflet/css/vex.css
+++ b/loleaflet/css/vex.css
@@ -37,7 +37,6 @@
 }
 
 .vex.vex-theme-plain{
-	position: relative;
 	z-index: 2001 !important;
 }
 
@@ -48,13 +47,22 @@
 }
 
 .vex-closing {
-    -webkit-animation: vex-fadeout .25s forwards;
-    animation: vex-fadeout .25s forwards;
+	-webkit-animation: vex-fadeout .25s forwards;
+	animation: vex-fadeout .25s forwards;
 }
 .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input select, .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input textarea, .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="date"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="datetime"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="datetime-local"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="email"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="month"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="number"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="password"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="search"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="tel"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="text"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="time"], .vex.vex
 -theme-plain .vex-dialog-form .vex-dialog-input input[type="url"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="week"]{
 	width: 95% !important;
 }
 
+.vex {
+	position: fixed;
+	overflow: auto;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+}
+
 /*mobile*/
 @media (max-width: 767px), (max-device-height: 767px) {
 	.vex-open .loleaflet-user-idle {


More information about the Libreoffice-commits mailing list