Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sozi-projects/Sozi
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aedc541c234df0b876edf6ec9429f7aec77adaab
Choose a base ref
..
head repository: sozi-projects/Sozi
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 38da6d2d42bcf1082abe2a9d76971cbb620c1c80
Choose a head ref
Showing with 27,197 additions and 14,167 deletions.
  1. +27 −71 README.md
  2. +8 −2 config/eslintrc.json
  3. +1 −1 config/jsdoc.json
  4. +0 −7 config/sozi-all-x64.json
  5. +0 −7 config/sozi-default.json
  6. +0 −7 config/sozi-linux-x64.json
  7. +95 −81 doc/sozi-logo-bg.svg
  8. +5 −3 extras/texts2paths/texts2paths.py
  9. +88 −166 gulpfile.js
  10. +210 −182 locales/ar.po
  11. +209 −186 locales/bg.po
  12. +212 −186 locales/ca.po
  13. +214 −188 locales/cs.po
  14. +214 −185 locales/da.po
  15. +212 −186 locales/de.po
  16. +213 −187 locales/el.po
  17. +213 −187 locales/eo.po
  18. +294 −274 locales/es.po
  19. +213 −187 locales/et.po
  20. +217 −190 locales/fa.po
  21. +206 −184 locales/fi.po
  22. +217 −188 locales/fr.po
  23. +343 −328 locales/gl.po
  24. +213 −187 locales/he.po
  25. +215 −186 locales/hu.po
  26. +214 −189 locales/id.po
  27. +283 −264 locales/it.po
  28. +213 −187 locales/ja.po
  29. +209 −187 locales/kab.po
  30. +203 −181 locales/ko.po
  31. +210 −185 locales/lt.po
  32. +740 −0 locales/lzh.po
  33. +194 −174 locales/messages.pot
  34. +208 −186 locales/ms.po
  35. +214 −189 locales/nb.po
  36. +213 −187 locales/nl.po
  37. +203 −181 locales/nn.po
  38. +212 −186 locales/pl.po
  39. +272 −249 locales/pt.po
  40. +272 −249 locales/pt_BR.po
  41. +218 −189 locales/ru.po
  42. +210 −186 locales/sk.po
  43. +203 −181 locales/sv.po
  44. +213 −187 locales/tr.po
  45. +268 −243 locales/zh_Hans.po
  46. +236 −211 locales/zh_Latn.po
  47. +213 −188 locales/zh_TW.po
  48. +9,732 −6,007 package-lock.json
  49. +20 −22 package.json
  50. BIN resources/icons/{icon-128.png → 128x128.png}
  51. BIN resources/icons/{icon-16.png → 16x16.png}
  52. BIN resources/icons/{icon-256.png → 256x256.png}
  53. BIN resources/icons/{icon-32.png → 32x32.png}
  54. BIN resources/icons/{icon-64.png → 64x64.png}
  55. BIN resources/icons/sozi.icns
  56. BIN resources/icons/sozi.ico
  57. +1 −0 src/css/sozi.editor.view.Timeline.css
  58. +1 −1 src/index-browser.html
  59. +1 −1 src/index-electron.html
  60. +65 −19 src/js/Controller.js
  61. +24 −11 src/js/Storage.js
  62. +30 −2 src/js/backend/AbstractBackend.js
  63. +16 −3 src/js/backend/Electron.js
  64. +3 −2 src/js/backend/FileReader.js
  65. +4 −2 src/js/backend/GoogleDrive.js
  66. +1 −1 src/js/editor.js
  67. +73 −60 src/js/exporter/index-electron.js
  68. +24 −4 src/js/index-electron.js
  69. +23 −20 src/js/model/CameraState.js
  70. +12 −6 src/js/model/Preferences.js
  71. +135 −71 src/js/model/Presentation.js
  72. +6 −3 src/js/model/Selection.js
  73. +8 −9 src/js/player.js
  74. +6 −3 src/js/player/Animator.js
  75. +44 −20 src/js/player/Camera.js
  76. +18 −9 src/js/player/FrameList.js
  77. +2 −1 src/js/player/FrameURL.js
  78. +12 −6 src/js/player/Media.js
  79. +49 −26 src/js/player/Player.js
  80. +48 −22 src/js/player/PlayerController.js
  81. +24 −12 src/js/player/TouchGestures.js
  82. +20 −7 src/js/player/Viewport.js
  83. +42 −0 src/js/svg/ImpressHandler.js
  84. +4 −2 src/js/svg/InkscapeHandler.js
  85. +12 −6 src/js/svg/SVGDocumentWrapper.js
  86. +1 −0 src/js/svg/index.js
  87. +2 −1 src/js/upgrade.js
  88. +12 −7 src/js/view/Preview.js
  89. +48 −31 src/js/view/Properties.js
  90. +16 −14 src/js/view/Timeline.js
  91. +19 −16 src/js/view/Toolbar.js
  92. +6 −3 src/js/view/VirtualDOMView.js
  93. +2 −2 src/templates/player.html
  94. +7,371 −0 yarn.lock
98 changes: 27 additions & 71 deletions README.md
Original file line number Diff line number Diff line change
@@ -23,15 +23,25 @@ Clone the repository:
Install the build tools and dependencies
----------------------------------------

Install [Node.js](http://nodejs.org/) and the [Grunt](http://gruntjs.com/) CLI.
The build script for Sozi is known to work with Node.js 11 from [Nodesource](https://github.com/nodesource/distributions).
If you plan to build a Windows executable from Linux or OS X, also install *wine*.
In Debian/Ubuntu and their derivatives, you can type the following commands.
The following instructions work successfully in Ubuntu 22.04.

Install [Node.js](http://nodejs.org/) and Gulp.
The build script for Sozi is known to work with Node.js 14 from [Nodesource](https://github.com/nodesource/distributions).

sudo apt install nodejs
sudo apt install wine # To build Windows executables
sudo npm install --global gulp-cli

From the root of the source tree, run:

npm install

If you plan to build a Windows executable, also install *wine*.
In Debian/Ubuntu and their derivatives, you can type the following commands.

dpkg --add-architecture i386
sudo apt update
sudo apt install wine wine32

If you plan to build Debian packages, install the following additional packages:

sudo apt install devscripts debhelper
@@ -40,18 +50,22 @@ If you plan to build Redhat packages, install the following additional packages:

sudo apt install rpm

From the root of the source tree:
If you plan to build Archlinux packages, install the following additional packages:

npm install
sudo apt install libarchive-tools

The `zip` compression tool must also be installed:

sudo apt install zip

Get the binaries for ffmpeg (optional, but video export will not work without them).
Download and unzip the FFMPEG executables to the following folders:

* Linux 32-bit: `vendor/ffmpeg/linux-ia32`
* Linux 64-bit: `vendor/ffmpeg/linux-x64`
* Windows 32-bit: `vendor/ffmpeg/win32-ia32`
* Windows 64-bit: `vendor/ffmpeg/win32-x64`
* MacOS X 64-bit: `vendor/ffmpeg/darwin-x64`
* Linux 32-bit: `resources/ffmpeg/linux-ia32`
* Linux 64-bit: `resources/ffmpeg/linux-x64`
* Windows 32-bit: `resources/ffmpeg/win32-ia32`
* Windows 64-bit: `resources/ffmpeg/win32-x64`
* MacOS X 64-bit: `resources/ffmpeg/darwin-x64`

Build
-----
@@ -74,63 +88,6 @@ gulp all
After a successful build, you will get a `build/dist` folder that contains the
generated application archives for each platform.

You can customize the build by creating a configuration file in the `config` folder.
See `config/sozi-default.json` and `config/sozi-linux-x64.json` for examples.
For instance, if you want to build 64-bit executables for OS X and Linux,
the configuration file (`config/sozi-linux-darwin-x64.json`) will look like this:

```json
{
"electronPackager": {
"platform": ["darwin", "linux"],
"arch": ["x64"],
"electronVersion": "9.2.1"
}
}
```

Then run Gulp with the `SOZI_CONFIG` environment variable:

```
SOZI_CONFIG=sozi-linux-darwin-x64 gulp all
```

Install
-------

A Debian package is available for users of Debian or Ubuntu-based distributions.

```
sudo dpkg -i sozi_[...].deb
```

You can convert it to the RPM format with [Alien](https://joeyh.name/code/alien/):

```
sudo alien --to-rpm sozi_[...].deb
```

For other platforms, Sozi is released as a zip/tar.xz archive that you can extract wherever you like.

* OS X users can drag the `sozi.app` subfolder into their `Applications` folder.
* Windows and Linux users can run the `sozi` executable directly from the extracted folder.

If installation on your specific platform is supported by Sozi,
there will be an *install* folder in the extracted archive containing installation scripts.
To install Sozi system-wide:

```
cd sozi-[...]/install
sudo ./install.sh
```

To install Sozi in your home folder:

```
cd sozi-[...]/install
./install-local.sh
```

Helping debug Sozi
==================

@@ -152,5 +109,4 @@ first column of this table:
|:---------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------|
| `ELECTRON_ENABLE_LOGGING` | Display JavaScript console messages in the current terminal window. |
| `SOZI_DEVTOOLS` | Open the developer tools immediately. This can be useful if `F12` has no effect or when you want to debug events that happen at startup. |
| `SOZI_DISABLE_HW_ACCELERATION` | Disable hardware acceleration in the rendering engine. |
| `SOZI_DISABLE_COLOR_CORRECT_RENDERING` | Disable color profile correction. |

10 changes: 8 additions & 2 deletions config/eslintrc.json
Original file line number Diff line number Diff line change
@@ -21,13 +21,19 @@
}
},
"rules": {
"jsdoc/require-jsdoc": ["warn", {
"no-unused-vars": ["warn"],
"no-prototype-builtins": ["warn"],
"jsdoc/require-jsdoc": ["error", {
"publicOnly": true,
"checkSetters": false,
"require": {
"ClassDeclaration": true,
"MethodDefinition": true
}
}]
}],
"jsdoc/multiline-blocks": ["warn", {
"noZeroLineText": false
}],
"jsdoc/tag-lines": ["warn", "any"]
}
}
2 changes: 1 addition & 1 deletion config/jsdoc.json
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
"plugins/markdown"
],
"opts": {
"destination": "dist/api",
"destination": "build/api",
"readme": "README.jsdoc.md"
}
}
7 changes: 0 additions & 7 deletions config/sozi-all-x64.json

This file was deleted.

7 changes: 0 additions & 7 deletions config/sozi-default.json

This file was deleted.

7 changes: 0 additions & 7 deletions config/sozi-linux-x64.json

This file was deleted.

Loading