Skip to content

Commit b41da06

Browse files
authored
Merge pull request #5487 from OpenShot/new-ui-theme
Theme Refactoring (including WIP Theme)
2 parents 8f2006a + 6bf063b commit b41da06

File tree

134 files changed

+24240
-17868
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+24240
-17868
lines changed

.gitlab-ci.yml

+9
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ windows-builder-x64:
107107
- $PREV_GIT_LABEL=(git describe --tags --abbrev=0 '@^')
108108
- git log "$PREV_GIT_LABEL..@" --oneline --pretty=format:"- %C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "build/install-x64/share/$CI_PROJECT_NAME.log"
109109
- python3 -u freeze.py build --git-branch=$CI_COMMIT_REF_NAME
110+
- $EXE_PATH = "$CI_PROJECT_DIR\build\exe.mingw-" + $PY_ABI + "\openshot-qt.exe"
111+
- $manifestPath = "installer/windows.manifest"
112+
- (Get-Content $manifestPath) -creplace "ARCHITECTURE", "amd64" | Set-Content $manifestPath
113+
- mt.exe -manifest installer/windows.manifest -validate_manifest
114+
- mt.exe -manifest installer/windows.manifest -outputresource:$EXE_PATH;1
110115
- python3 -u installer/build_server.py "$SLACK_TOKEN" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "False" "$CI_COMMIT_REF_NAME" "$MAC_PASSWORD"
111116
when: always
112117
except:
@@ -146,6 +151,10 @@ windows-builder-x86:
146151
- python3 -u freeze.py build --git-branch=$CI_COMMIT_REF_NAME
147152
- $EXE_PATH = "$CI_PROJECT_DIR\build\exe.mingw-" + $PY_ABI + "\openshot-qt.exe"
148153
- editbin /LARGEADDRESSAWARE "$EXE_PATH"
154+
- $manifestPath = "installer/windows.manifest"
155+
- (Get-Content $manifestPath) -creplace "ARCHITECTURE", "x86" | Set-Content $manifestPath
156+
- mt.exe -manifest installer/windows.manifest -validate_manifest
157+
- mt.exe -manifest installer/windows.manifest -outputresource:$EXE_PATH;1
149158
- python3 -u installer/build_server.py "$SLACK_TOKEN" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "True" "$CI_COMMIT_REF_NAME" "$MAC_PASSWORD"
150159
when: always
151160
except:

doc/clips.rst

+21-3
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,28 @@ Here is a list of all methods for cutting and/or trimming clips in OpenShot:
8282
:guilabel:`Slice All` (all intersecting clips on all tracks will be cut/sliced).
8383
**Split Clip Dialog** Right click on a file, and choose :guilabel:`Split Clip`. A dialog will appear which allows
8484
for creating lots of small cuts in a single video file.
85-
**Razor Tool** The :guilabel:`razor tool` from the **Edit Toolbar** cuts a clip wherever you click on it.
85+
**Razor Tool** The :guilabel:`razor tool` from the **Timeline Toolbar** cuts a clip wherever you click on it.
8686
So be careful, it is easy and dangerous!
8787
====================== ============
8888

8989
Keep in mind that the above cutting methods also have :ref:`keyboard_shortcut_ref`, to save even more time.
9090

91+
Remove Gap
92+
""""""""""
93+
The :guilabel:`Remove Gap` context menu option deletes the gap between two clips on the timeline, shifting all subsequent clips to close the gap.
94+
Right click on a gap between clips to find this option. The option is only available when a gap is detected.
95+
96+
- **Usage Example:** Use this option when you want to quickly eliminate a specific gap between clips caused by trimming or the razor tool.
97+
- **Tip:** If you have many gaps on a single track, you can also right click on the track name, and select :guilabel:`Remove All Gaps`.
98+
99+
Remove All Gaps
100+
"""""""""""""""
101+
The :guilabel:`Remove All Gaps` context menu option removes all gaps between clips on the timeline, shifting all clips to ensure there are no empty spaces.
102+
Right click on a track name to find this option. The option is only available when gaps are detected.
103+
104+
- **Usage Example:** Ideal for tracks that contain back-to-back clips, such as a photo slideshow, where no gaps are desired.
105+
- **Tip:** Review the entire track after using this option to ensure that no clips are unintentionally moved.
106+
91107
.. _clip_presets_ref:
92108

93109
Context Menu
@@ -513,7 +529,8 @@ of the screen, without adding any black bars on the edges. The scale methods are
513529
Scale X and Scale Y
514530
"""""""""""""""""""
515531
The :guilabel:`Scale X` and :guilabel:`Scale Y` properties are key-frame curves that represent horizontal and vertical scaling in percentages,
516-
respectively. The range for these curves is 0 to 1. See :ref:`clip_transform_ref`.
532+
respectively. The range for these curves is 0 to 1. See :ref:`clip_transform_ref`. OpenShot limits the max scale values based
533+
on the file type and the project size, to prevent crashes and performance issues.
517534

518535
- **Usage Example:** Creating a zoom-in effect by animating the Scale X and Scale Y curves simultaneously.
519536
- **Tip:** Scale the image larger than the screen, only revealing a portion of the video. This is a simple way to crop a portion of the video.
@@ -523,7 +540,8 @@ respectively. The range for these curves is 0 to 1. See :ref:`clip_transform_ref
523540
Shear X and Shear Y
524541
"""""""""""""""""""
525542
The :guilabel:`Shear X` and :guilabel:`Shear Y` properties are key-frame curves that represent X and Y shear
526-
angles in degrees, respectively. See :ref:`clip_transform_ref`.
543+
angles in degrees, respectively. See :ref:`clip_transform_ref`. OpenShot limits the max shear values based
544+
on the file type and the project size, to prevent crashes and performance issues.
527545

528546
- **Usage Example:** Adding a dynamic tilt effect to a clip by animating the shear angles.
529547
- **Tip:** Use shear properties for creating slanted or skewed animations.

doc/effects.rst

+2
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ used to correct poorly lit videos or to create dramatic lighting effects for art
259259
contrast ``(float, 0 to 100)`` The curve to adjust the contrast (3 is typical, 20 is a lot, 100 is max. 0 is invalid)
260260
========================== ============
261261

262+
.. _caption_effect_ref:
263+
262264
Caption
263265
"""""""
264266
Add text captions on top of your video. We support both VTT (WebVTT) and SubRip (SRT) subtitle file formats. These

doc/export.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Image Sequence Settings
113113
================== ============
114114
Image Setting Name Description
115115
================== ============
116-
Image Format The string format that represents the output file name in an sequence of images. For example, %05d.png would pad a number with 5 digits: 00001.png, 00002.png.
116+
Image Format The string format that represents the output file name in a sequence of images. For example, %05d.png would pad a number with 5 digits: 00001.png, 00002.png.
117117
================== ============
118118

119119
Video Settings

doc/files.rst

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
.. You should have received a copy of the GNU General Public License
1818
along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
1919
20+
.. _files_ref:
21+
2022
Files
2123
=====
2224

doc/images/themes.jpg

256 KB
Loading

doc/images/timeline.jpg

63.9 KB
Loading

doc/installation.rst

+32-7
Original file line numberDiff line numberDiff line change
@@ -90,24 +90,49 @@ and creating a launcher for it, see our
9090

9191
.. image:: images/linux-appimage-permissions.jpg
9292

93+
Unable to Launch AppImage?
94+
~~~~~~~~~~~~~~~~~~~~~~~~~~
95+
Please verify that the ``libfuse2`` library is installed, which is required to mount and read an AppImage.
96+
On newer versions of Ubuntu (i.e. 22.04+), ``libfuse2`` is not installed by default. You can install it with
97+
the following command:
98+
99+
.. code-block:: console
100+
101+
sudo apt install libfuse2
102+
103+
Install AppImage Launcher
104+
~~~~~~~~~~~~~~~~~~~~~~~~~
105+
If you plan on using OpenShot often, you will probably want an integrated launcher for our AppImage.
106+
We recommend using AppImageLauncher, which is the officially supported way to launch (and manage) AppImage files on
107+
your Linux desktop. If you are on a Debian-based distro (Ubuntu, Mint, etc...), there is an official
108+
AppImageLauncher PPA:
109+
110+
.. code-block:: console
111+
112+
sudo add-apt-repository ppa:appimagelauncher-team/stable
113+
sudo apt update
114+
sudo apt install appimagelauncher
115+
93116
Linux (PPA)
94117
^^^^^^^^^^^
95118

96119
For Debian-based Linux distributions (Ubuntu, Mint, etc...), we also have a PPA
97120
(Personal Package Archive), which adds our official OpenShot software repository to your package
98121
manager, making it possible to install our latest version, without relying on our AppImages.
99122

100-
.. code-block:: console
123+
Stable PPA (Contains only official releases)
124+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
101125

102-
:caption: Stable PPA (Contains only official releases)
126+
.. code-block:: console
103127
104128
sudo add-apt-repository ppa:openshot.developers/ppa
105129
sudo apt update
106130
sudo apt install openshot-qt python3-openshot
107131
108-
.. code-block:: console
132+
Daily PPA (Highly experimental and unstable, for testers)
133+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
109134

110-
:caption: Daily PPA (Highly experimental and unstable, for testers)
135+
.. code-block:: console
111136
112137
sudo add-apt-repository ppa:openshot.developers/libopenshot-daily
113138
sudo apt update
@@ -136,21 +161,21 @@ projects first (\*.osp files). Please see :ref:`preferences_reset_ref` for instr
136161
the previous ``openshot.settings`` file (for a clean install with **default preferences**).
137162

138163
Windows
139-
-------
164+
~~~~~~~
140165

141166
#. Open **Control Panel** from the Start menu
142167
#. Click on **Programs and Features**
143168
#. Select OpenShot Video Editor, then click **Uninstall**
144169

145170
Mac
146-
---
171+
~~~
147172

148173
#. Open **Finder** and go to **Applications**
149174
#. Drag the OpenShot Video Editor icon to the **Trash** in the Dock
150175
#. Right-click **Trash** and choose **Empty Trash**
151176

152177
Ubuntu (Linux)
153-
--------------
178+
~~~~~~~~~~~~~~
154179

155180
#. Open up **Files**
156181
#. Locate the ``*.AppImage`` and delete the file

doc/introduction.rst

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ Features
5757
- **JSON project format** (`OpenShot Cloud API <https://www.openshot.org/cloud-api/>`_ compatible)
5858
- **Customizable shortcuts**
5959
- **Translations** (100+ languages)
60+
- **High DPI** monitor support
6061
- **Community support** (`Visit our forum <https://openshot.org/forum/>`_)
6162

6263
Screenshot

0 commit comments

Comments
 (0)