Commit 46a67072 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '2004'

parents a99ec9e9 1a03fe69
Pipeline #17512 passed with stage
in 14 minutes and 37 seconds
...@@ -159,7 +159,7 @@ linuxdeployqt $APPDIR/usr/share/applications/org.kde.kdenlive.desktop \ ...@@ -159,7 +159,7 @@ linuxdeployqt $APPDIR/usr/share/applications/org.kde.kdenlive.desktop \
-qmldir=$DEPS_INSTALL_PREFIX/qml \ -qmldir=$DEPS_INSTALL_PREFIX/qml \
-verbose=2 \ -verbose=2 \
-bundle-non-qt-libs \ -bundle-non-qt-libs \
-extra-plugins=$APPDIR/usr/lib/mlt,$APPDIR/usr/plugins \ -extra-plugins=$APPDIR/usr/lib/mlt,$APPDIR/usr/plugins,$APPDIR/usr/qml \
-exclude-libs=libnss3.so,libnssutil3.so,libGL.so.1 -exclude-libs=libnss3.so,libnssutil3.so,libGL.so.1
# -appimage \ # -appimage \
......
...@@ -128,7 +128,9 @@ void Core::initGUI(const QUrl &Url, const QString &clipsToLoad) ...@@ -128,7 +128,9 @@ void Core::initGUI(const QUrl &Url, const QString &clipsToLoad)
m_mainWindow = new MainWindow(); m_mainWindow = new MainWindow();
m_guiConstructed = true; m_guiConstructed = true;
QStringList styles = QQuickStyle::availableStyles(); QStringList styles = QQuickStyle::availableStyles();
if (styles.contains(QLatin1String("org.kde.desktop"))) { if (styles.contains(QLatin1String("Plasma"))) {
QQuickStyle::setStyle("Plasma");
} else if (styles.contains(QLatin1String("org.kde.desktop"))) {
QQuickStyle::setStyle("org.kde.desktop"); QQuickStyle::setStyle("org.kde.desktop");
} else if (styles.contains(QLatin1String("Fusion"))) { } else if (styles.contains(QLatin1String("Fusion"))) {
QQuickStyle::setStyle("Fusion"); QQuickStyle::setStyle("Fusion");
......
...@@ -188,8 +188,6 @@ Rectangle { ...@@ -188,8 +188,6 @@ Rectangle {
ToolButton { ToolButton {
id: expandButton id: expandButton
anchors.left: parent.left anchors.left: parent.left
height: trackHeadRoot.buttonSize
width: trackHeadRoot.buttonSize
focusPolicy: Qt.NoFocus focusPolicy: Qt.NoFocus
//icon.width: trackHeadRoot.iconSize //icon.width: trackHeadRoot.iconSize
//icon.height: trackHeadRoot.iconSize //icon.height: trackHeadRoot.iconSize
...@@ -223,7 +221,7 @@ Rectangle { ...@@ -223,7 +221,7 @@ Rectangle {
color: trackLed.bgColor color: trackLed.bgColor
} }
width: fontMetrics.boundingRect("M").width * trackHeadRoot.trackTag.length width: fontMetrics.boundingRect("M").width * trackHeadRoot.trackTag.length
height: trackHeadRoot.buttonSize height: expandButton.height
y: 1 y: 1
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
...@@ -309,8 +307,6 @@ Rectangle { ...@@ -309,8 +307,6 @@ Rectangle {
checkable: true checkable: true
enabled: trackHeadRoot.effectNames != '' enabled: trackHeadRoot.effectNames != ''
checked: enabled && trackHeadRoot.isStackEnabled checked: enabled && trackHeadRoot.isStackEnabled
height: trackHeadRoot.buttonSize
width: trackHeadRoot.buttonSize
focusPolicy: Qt.NoFocus focusPolicy: Qt.NoFocus
//icon.width: trackHeadRoot.iconSize //icon.width: trackHeadRoot.iconSize
//icon.height: trackHeadRoot.iconSize //icon.height: trackHeadRoot.iconSize
...@@ -321,8 +317,6 @@ Rectangle { ...@@ -321,8 +317,6 @@ Rectangle {
} }
ToolButton { ToolButton {
id: muteButton id: muteButton
height: trackHeadRoot.buttonSize
width: trackHeadRoot.buttonSize
focusPolicy: Qt.NoFocus focusPolicy: Qt.NoFocus
//icon.width: trackHeadRoot.iconSize //icon.width: trackHeadRoot.iconSize
//icon.height: trackHeadRoot.iconSize //icon.height: trackHeadRoot.iconSize
...@@ -346,8 +340,6 @@ Rectangle { ...@@ -346,8 +340,6 @@ Rectangle {
ToolButton { ToolButton {
id: lockButton id: lockButton
height: trackHeadRoot.buttonSize
width: trackHeadRoot.buttonSize
focusPolicy: Qt.NoFocus focusPolicy: Qt.NoFocus
//icon.width: trackHeadRoot.iconSize //icon.width: trackHeadRoot.iconSize
//icon.height: trackHeadRoot.iconSize //icon.height: trackHeadRoot.iconSize
......
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