Commit graph

13707 commits

Author SHA1 Message Date
Tomaž Vajngerl
3fa52ac5a8 Duplicate the presentation menu entries for drawing
Currently the presentation and drawing menu entries use the same
definition, but as drawings are different with different terms,
it is best to separate the presentation and drawing entires
instead of handling the exceptions all the time.

Change-Id: I078eb4ebb5014a04614d20363042b3cd75e9a36d
Signed-off-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
2021-01-21 10:22:58 +01:00
Tomaž Vajngerl
400432f159 modify the toolbar for drawings
Separate the toolbar from presentation and remove icons that are
valid for presentation only.

Change-Id: I0dd74f396326b838c9a65352978a771bdb5da13d
Signed-off-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
2021-01-21 10:22:58 +01:00
Tomaž Vajngerl
aa6d8af042 Separate shortcuts online help for presentations and drawings
Change-Id: Ic6290ea43fc55e78a037ac3b774cb0eb090e8ba5
Signed-off-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
2021-01-21 10:22:58 +01:00
Tomaž Vajngerl
d92252522c Add hello-world for Draw
Change-Id: I4300c96d16c1e4911aabb5aeb1ec7181dfeeae1d
Signed-off-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
2021-01-21 10:22:58 +01:00
Tomaž Vajngerl
8d8f9f4dd3 Enable editing of ODG in discovery.xml
Change-Id: Ie019636a40f8a4ff712cca72a87258c87b51b775
Signed-off-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
2021-01-21 10:22:58 +01:00
Tamás Zolnai
dbad4b2c0c Update cypress: 6.1.0 -> 6.2.1.
It fixes a hang related to retries. It might be useful
in our case too. I've seen hangs on Jenkins, which might be
related.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I8320f9b38c59074d2b5dd3d7b0cad0c5828b0849
2021-01-20 09:18:59 +01:00
Pranam Lashkari
005132da03 leaflet: support reordering sheet tabs via drag and drop
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: Ibe4106aca08456410c4c524eeb8a630993737815
2021-01-19 14:14:22 -04:00
Tamás Zolnai
5eb8e5448f cypress: fix up and enable chart test.
It crashes if the mobile wizard is closed before exiting
chart editing mode.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I47143543220aaebf474e1d1aa560c7df2c2a14f5
2021-01-19 15:21:45 +01:00
Henry Castro
7e0186600d loleaflet: makefile: fix builddir != srcdir
Change-Id: I97083c0a093a4038cb91dd618096eeb4292463fe
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-01-18 17:31:19 -04:00
Tamás Zolnai
6643b57f4a cypress: reenable writer/simultaneous_typing multi-user test.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ibcbff205000b60c86699b04e1cd95b5bc05f7b1e
2021-01-18 20:39:03 +01:00
Tamás Zolnai
218e47e65a Switch to the correct view before calling getSelectionType() method.
This method needs to be called with having the correct view activated.

It caused a crash in writer/simultaneous_typing multi-user cypress test.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I57dd58a635ce7ea127200a6a3f0cadc8c0861aaf
2021-01-18 20:39:03 +01:00
Pedro Pinto Silva
f292ff4eb7 Add coolstress to gitignore
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I4662bfa7d22c76dde316c5162510f821f694507b
2021-01-18 15:17:50 +00:00
Rash419
bee45ebf72 leaflet: display correct number of characters in statusbar
Signed-off-by: Rash419 <rasheshpadia419@gmail.com>
Change-Id: I93dc5c54abb3a43cdffe1b12ca3e22247ed22f67
2021-01-18 17:10:35 +02:00
Andras Timar
8b0af828ef Revert "docker: do not modify loolwsd.xml, use command line parameters instead"
This reverts commit 93dfff7dad.
Reason: #1264 and #1235
2021-01-18 15:12:29 +01:00
Tamás Zolnai
c0ae7f8bb8 Fix "Cannot read property 'color' of undefined" error
Crash trace:
at NewClass.getViewColor (/src/map/Map.js:702:33)
at NewClass._onUpdateCellViewCursor (/src/layer/tile/TileLayer.js:1466:55)
at NewClass._onCellViewCursorMsg (/src/layer/tile/TileLayer.js:1450:8)
at NewClass._onMessage (/src/layer/tile/TileLayer.js:710:9)
at NewClass._onMessage (/src/layer/tile/CalcTileLayer.js:394:37)
at NewClass._onMessage (/src/core/Socket.js:916:24)

Caught by calc/sheet_operations multi-user test.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I56b686e8d9f27a407f1fef54808e4f65c99173f0
2021-01-18 13:36:26 +01:00
Tamás Zolnai
fde1d4c529 cypress: prefer chromium over chrome.
With chrome tests sometimes fail on starting
the chrome binary.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Id5c6af71efad8622b3885b8904f2ef3ede82d631
2021-01-18 13:36:26 +01:00
Gökay Şatır
137a757d72 CanvasSectionProps: Add an overview of sections.
We are drawing things from different files onto the same canvas.
CanvasSectionContainer is organising them. When they are too many, it is difficult to know about sections' important properties.
CanvasSectionProps keeps sections maintainable.

Signed-off-by: Gökay Şatır <gokaysatir@collabora.com>
Change-Id: I9e81104c30f30a47c02625ce9d6716a98958317c
2021-01-18 15:17:07 +03:00
Andreas-Kainz
038c85b8f9 change default sidebar icon size to use 24px icons (like in toolbars)
Signed-off-by: Andreas-Kainz <andreas_k@abwesend.de>
Change-Id: I8b9caef707bdd856d126841c3c0135cd738e692e
2021-01-18 09:25:50 +01:00
Andreas-Kainz
d3ff48f65a Sidebar should use .png icons instead of .svg fix #786
Signed-off-by: Andreas-Kainz <andreas_k@abwesend.de>
Change-Id: Ieeb8c5f37efb6e3f262d50f4fb54bbef59c2ff06
2021-01-18 09:25:50 +01:00
Gökay Şatır
15bf787771 CanvasSectionContainer: Fixes.
Bugs related to ordering of sections are fixed.
addSection and createSection functions are separated.
contextMenu event is added.
Sections' drawing orders are updated for future uses.

Signed-off-by: Gökay Şatır <gokaysatir@collabora.com>
Change-Id: I89127c97ad7b7dac4b293c4108c44cb6c4427134
2021-01-17 18:56:27 +03:00
Dennis Francis
95a8028f00 On resize allow recomputation of section pos and size
by resetting the isLocated flag for each section.

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I0ad41f20219afd8b90050bd43223843ca280587d
2021-01-16 18:12:00 +05:30
Dennis Francis
10f70ae866 fix pixel offset between grid and row headers
Sections which are not yet expanded via locateSections() can interfere
with the hitLeft() and hitTop() for sections of same z-index depending
on order of addition. So lets skip the sections for computing hitLeft()
and hitTop(). This also avoids redoing locateSections() for all sections
everytime a new section is added.

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I7595f5b5cfaa61d8fcfe177edd4c605d3fb7b122
2021-01-16 18:12:00 +05:30
Dennis Francis
7cf060dfbb don't leave 1px empty space near headers
when there are no freeze-panes active.

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: Id5b651d4b1e76cd14b725d125f813d93ed031ff8
2021-01-16 18:12:00 +05:30
Dennis Francis
34578ce3fd fix the debug tile-border rectangles in red
Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I93b950a5f903ed5ed2713a518911f8e37eadddfc
2021-01-16 18:12:00 +05:30
Michael Meeks
136f20b386 Use jsdom to load and execute our CSS, HTML and JS.
Change-Id: Ia7414e1fd19bf7ebfa29274d1acac5cee4837341
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2021-01-16 12:18:47 +00:00
Michael Meeks
c7d0de0877 Start of using NodeJS to do load simulation.
Change-Id: Id27ff406adc2269665aca0bbb54dd2102a4c7c74
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2021-01-16 12:18:47 +00:00
Michael Meeks
4e92b5a697 Special case opacity to avoid arithmetic where possible.
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Change-Id: I37a72bc966424ca1b4c30b31d9fcf88d15c11789
2021-01-16 12:18:24 +00:00
Tamás Zolnai
b52d169686 Revert "cypress: remove workaround for multi-user test cases."
This reverts commit c3e1986d63.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ib0d6d0972262b2ec82bc60672bf5ae27be32fb2e
2021-01-15 23:01:30 +01:00
Tamás Zolnai
9e9e9f3117 cypress: improve selectFullTable() helper of table properties tests.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I9362c0b8d528d0e7cd5841a50584f866a4432b3f
2021-01-15 15:16:28 +01:00
Michael Meeks
f4008cd979 clipboard: give a more explicit clustering error earlier.
Change-Id: I3050fd5f9e66174ece03620e956ee394684f369f
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2021-01-15 09:31:22 +00:00
Tor Lillqvist
c5118ea43a Fix crash in iOS app: Don't bother with UnitKit
I don't recall if simply ifdeffing is the proper way to bypass UnitKit
stuff (that I don't understand) for the mobile apps, but at least it
helps.

Signed-off-by: Tor Lillqvist <tml@iki.fi>
Change-Id: I85d477e4ee7d11c597d95a9b0b42af7e5f7ad122
2021-01-15 01:36:52 +02:00
Tamás Zolnai
c3e1986d63 cypress: remove workaround for multi-user test cases.
We had an issue with loading two views to the same document
at the same time.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I8b1ba92eca5e59bfa50cbcd637f1076d5e15c664
2021-01-14 15:04:13 +01:00
Tamás Zolnai
efb96f0700 cypress: reenable paragraph_prop multi-user test.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: If57964320d2615c81b0bcbc57c0f942e463c60ea
2021-01-14 15:04:13 +01:00
Tamás Zolnai
d1118b43be Fix wrong view info when opening two views close in time.
The issue is that we passed viewinfo messaged to do _docLayer
in wrong order because of the too simple delaying mechanism.

Wrong scenario steps:
viewinfo-1 arrives: _docLayer is not initialized yet -> 100 ms delay.
viewinfo-2 arrives: _docLayer is initialized now -> pass to _docLayer.
viewinfo-1's timeout: _docLayer is initialized now -> pass to _docLayer

Better to use the more sophisticated delaying method.
See _tryToDelayMessage() and related methods. They keep the order
of the messages.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I335b350b1553cfdee573f7d2e57c86c4b8f9af84
2021-01-14 15:04:13 +01:00
Miklos Vajna
78f192399d Revert "wsd: disable ssl by default, enable ssl termination by default"
This reverts commit f6bf6f49ed. I did not
consider that this makes it harder to do a local developer setup with
reverse proxy + make run; also that if you don't read the doc to set up
a reverse proxy, then the default now serves http content and advertises
https, which is not helping sysadmins.

This needs more thinking how to improve one scenario without hurting
others.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: Ic789faa2dc5bb19a79d651dc81d4eaaf0b48607a
2021-01-14 13:59:44 +01:00
Tamás Zolnai
6786f563f8 cypress: print out test failure output online during parallel build.
Before this commit failure logs were gathered inside an error log
file and they were displayed after all tests are finsihed.
After this commit we print this failures logs when the error occurs
and also at the end of the test run. Sometimes Jenkins does not finish
the whole build because of timeout abortion. In this case, it would
be helpful to see some failure logs.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ibe7cb6aa2c9f99912d604c4b642cda363352ffcd
2021-01-14 12:57:41 +01:00
mert
f72d394a02 Fix calc text-input focus problem on Android
Change-Id: Iacd279f741c35703807f14a9798fbe2ef0f45d50
Signed-off-by: mert <mert.tumer@collabora.com>
2021-01-14 11:27:12 +03:00
Szymon Kłos
fe5454faa6 popup: improve text layout
Change-Id: Id3700692706bb67b8e626b24a2ae9c10dff1f772
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
2021-01-14 08:16:33 +01:00
Andreas-Kainz
79374db3ae Signed-off-by: Andreas-Kainz <andreas_k@abwesend.de>
Change-Id: I3ce2be9cc6362c09725fe1692e6853f195274211
2021-01-14 06:29:37 +01:00
Ashod Nakashian
ce3dd02ef3 wsd: new NetUtil file for network utilities
Move the connect function into the NetUtil
translation unit to aid using it for the
upcoming async socket logic.

The NetUtil should also come in handy for
the miscellaneous network helpers we have.

Change-Id: I2ee0c6e3e1769fd87572d7407d3b4979b59ffe6a
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-01-13 22:05:18 -05:00
Ashod Nakashian
18446d63cf wsd: test: don't report test timeout outside of tests
Change-Id: I6c5042578a3b718e2305139c0e4ea390b4a43ed3
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-01-13 22:03:29 -05:00
Ashod Nakashian
307900ef9f wsd: misc and cosmetics
Change-Id: I407a20af9297278bdfd06ef3587cdb1d5fff0195
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-01-13 16:24:29 -05:00
Ashod Nakashian
417d19bce6 wsd: log when simulating socket error to help troubleshoot
When we simulate socket error it's hard to understand
what is going on, since there is no real errno to
explain the -1 return value. This is at least true
in the SSL case where we don't set errno (perhaps
we should?). At any rate, it's good form to log
that we are messing up with the return value and
that the real socket API hasn't been even invoked.

Change-Id: Ib76f0259dbdcfe0cfae97343c11ca45461079fa1
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-01-13 16:24:29 -05:00
Ashod Nakashian
6713c2a8d5 wsd: avoid reading the config entry more than once
This code is executed regularly, at every poll.
The config getter internally throws exceptions,
catches and handles, before returning. While
this isn't performance sensitive, it is noisy
to have such poor-behaving code executed
frequently and regularly.

But the real motivation is the pain this exception
causes when debugging an exception. GDB ends up
catching this rogue exception, which is hardly
useful or helpful.

At any rate, we don't need to get a config entry
more than once, as they can't change during the
lifetime of the process.

Change-Id: Ic69fb94674b74b298987131d44d9baa27e9fa4aa
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-01-13 16:24:29 -05:00
Michael Meeks
673c3cfb98 Remove un-used _isLoading and ScopeGuard.
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Change-Id: I0f7536023cbbef52087c3110565d046dd1ab8835
2021-01-13 16:55:35 +00:00
Shubham Goyal
3a3867e1c6 Resolve #805 : Remove Mutex lock
Signed-off-by: Shubham Goyal <22shubh22@gmail.com>
Change-Id: I80da9d085590e67c0998ce971225a8c9903c0bb7
2021-01-13 16:55:35 +00:00
Pedro Pinto Silva
ad87fb854d Fontwork: layout improvements
- iconview fix layout without using hard-coded margins
- fontwork: make sure the elements start at the same left position as the title and that they occupy the dialog evenly
- hide unnecessary label
- space-around when on mobile

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ia92acf1cbf09a3e7c6e996f9a846163835b115af
2021-01-13 16:57:16 +01:00
Tamás Zolnai
db0e7e9973 cypress: simplify typeIntoDocument() method.
cy.click() will grab the focus to the textarea.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I20f0df2fd8a31d3ff4b85ba38fdc503c10987dbb
2021-01-13 16:43:35 +01:00
Ashod Nakashian
06c5c90dd5 wsd: test: support SSL in classic tests
Add support for configuring the SSL certificates
when running the test binary as well as setting
up the SSL context.

Also adds the SSL socket headers with proper
compile-time guards for when SSL is disabled.

Change-Id: I99992639a66a64871f8ff8a2b2105279ead63ca1
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-01-13 08:07:06 -05:00
Ashod Nakashian
feac95ab77 wsd: test: shorter poll interval during tests
Technically, the poll interval should be
irrelevant because the tests should wakeupWorld
when they need to break the poll. However, it
turns out that many tests implicitly rely on
the poll interval to be large, and if for
any reason the poll wakes up, the tests either
advance their phase too soon, or assert, causing
random failures and reliability issues.

As the tests should now be more robust (at
least the ones that were non-deterministic
in this way), we can now lower the interval
to catch other cases (either extant or in the
future).

Change-Id: Id0d472e70875db8669bb21c6582b0d5052b19bfb
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-01-13 08:07:06 -05:00