Commit 167aadd3 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'master' of invent.kde.org:multimedia/kdenlive

parents 92c63e83 e3d5993d
Pipeline #52351 passed with stage
in 10 minutes and 27 seconds
......@@ -82,7 +82,7 @@ cp -r $DEPS_INSTALL_PREFIX/plugins/audio $APPIMAGEPLUGINS
cp -r $DEPS_INSTALL_PREFIX/plugins/org.kde.kdecoration2 $APPIMAGEPLUGINS
cp -r $DEPS_INSTALL_PREFIX/plugins/kstyle_breeze_config.so $APPIMAGEPLUGINS
cp $BUILD_PREFIX/deps-build/ext_bigshot/ext_bigshot-prefix/src/ext_bigshot-build/*.so $APPDIR/usr/lib/frei0r-1
cp $BUILD_PREFIX/deps-build/ext_bigshot/ext_bigshot-prefix/src/ext_bigshot-build/*.so $APPDIR/usr/lib/frei0r-1 || true
mkdir -p $APPDIR/usr/libexec
cp -r $DEPS_INSTALL_PREFIX/lib/x86_64-linux-gnu/libexec/kf5/* $APPDIR/usr/libexec/
......
......@@ -66,6 +66,9 @@
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="size_w">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
......@@ -86,6 +89,9 @@
</item>
<item row="1" column="3">
<widget class="QSpinBox" name="size_h">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
......@@ -100,6 +106,9 @@
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="frame_num">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>500000</number>
</property>
......@@ -120,6 +129,9 @@
</item>
<item row="2" column="3">
<widget class="QSpinBox" name="frame_den">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
......@@ -134,6 +146,9 @@
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="aspect_num">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
......@@ -154,6 +169,9 @@
</item>
<item row="4" column="3">
<widget class="QSpinBox" name="aspect_den">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
......@@ -168,6 +186,9 @@
</item>
<item row="5" column="1">
<widget class="QSpinBox" name="display_num">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
......@@ -188,6 +209,9 @@
</item>
<item row="5" column="3">
<widget class="QSpinBox" name="display_den">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
......
......@@ -1608,6 +1608,97 @@
<header>kcolorbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>graphicsView</tabstop>
<tabstop>origin_x_left</tabstop>
<tabstop>value_x</tabstop>
<tabstop>origin_y_top</tabstop>
<tabstop>value_y</tabstop>
<tabstop>value_w</tabstop>
<tabstop>value_h</tabstop>
<tabstop>zUp</tabstop>
<tabstop>zDown</tabstop>
<tabstop>zTop</tabstop>
<tabstop>zBottom</tabstop>
<tabstop>zValue</tabstop>
<tabstop>buttonSelectImages</tabstop>
<tabstop>buttonSelectText</tabstop>
<tabstop>buttonUnselectAll</tabstop>
<tabstop>buttonSelectAll</tabstop>
<tabstop>buttonSelectRects</tabstop>
<tabstop>use_grid</tabstop>
<tabstop>show_guides</tabstop>
<tabstop>vguides</tabstop>
<tabstop>hguides</tabstop>
<tabstop>guideColor</tabstop>
<tabstop>buttonFitZoom</tabstop>
<tabstop>buttonRealSize</tabstop>
<tabstop>zoom_slider</tabstop>
<tabstop>zoom_spin</tabstop>
<tabstop>displayBg</tabstop>
<tabstop>bgBox</tabstop>
<tabstop>templateBox</tabstop>
<tabstop>createButton</tabstop>
<tabstop>cancelButton</tabstop>
<tabstop>title_duration</tabstop>
<tabstop>itemzoom</tabstop>
<tabstop>itemrotatex</tabstop>
<tabstop>itemrotatey</tabstop>
<tabstop>itemrotatez</tabstop>
<tabstop>itemleft</tabstop>
<tabstop>itemhcenter</tabstop>
<tabstop>itemright</tabstop>
<tabstop>itemtop</tabstop>
<tabstop>itemvcenter</tabstop>
<tabstop>itembottom</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>rectBColor</tabstop>
<tabstop>gradient_rect</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>font_size</tabstop>
<tabstop>font_weight_box</tabstop>
<tabstop>buttonUnder</tabstop>
<tabstop>buttonItalic</tabstop>
<tabstop>plain_color</tabstop>
<tabstop>fontColorButton</tabstop>
<tabstop>buttonInsertUnicode</tabstop>
<tabstop>gradient_color</tabstop>
<tabstop>gradients_combo</tabstop>
<tabstop>edit_gradient</tabstop>
<tabstop>textOutline</tabstop>
<tabstop>textOutlineColor</tabstop>
<tabstop>shadowBox</tabstop>
<tabstop>blur_radius</tabstop>
<tabstop>shadowColor</tabstop>
<tabstop>shadowX</tabstop>
<tabstop>shadowY</tabstop>
<tabstop>buttonAlignLeft</tabstop>
<tabstop>buttonAlignCenter</tabstop>
<tabstop>buttonAlignRight</tabstop>
<tabstop>letter_spacing</tabstop>
<tabstop>line_spacing</tabstop>
<tabstop>backgroundColor</tabstop>
<tabstop>bgAlphaSlider</tabstop>
<tabstop>backgroundAlpha</tabstop>
<tabstop>anim_start</tabstop>
<tabstop>anim_end</tabstop>
<tabstop>keep_aspect</tabstop>
<tabstop>resize50</tabstop>
<tabstop>resize100</tabstop>
<tabstop>resize200</tabstop>
<tabstop>patternsList</tabstop>
<tabstop>btn_add</tabstop>
<tabstop>btn_remove</tabstop>
<tabstop>btn_removeAll</tabstop>
<tabstop>scaleSlider</tabstop>
<tabstop>rectFColor</tabstop>
<tabstop>font_family</tabstop>
<tabstop>gradients_rect_combo</tabstop>
<tabstop>preserveAspectRatio</tabstop>
<tabstop>edit_rect_gradient</tabstop>
<tabstop>rectLineWidth</tabstop>
<tabstop>plain_rect</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment