Skip to content

Commit

Permalink
Continue modernizing the UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@emericg
emericg committed Apr 29, 2024
1 parent d02cd04 commit 9fcc2f8
Show file tree
Hide file tree
Showing 37 changed files with 429 additions and 567 deletions.
30 changes: 19 additions & 11 deletions qml/Application.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
*/

import QtQuick
import QtQuick.Controls
import QtQuick.Window
import QtQuick.Effects
import QtQuick.Controls

import ThemeEngine

Expand Down Expand Up @@ -277,16 +278,23 @@ ApplicationWindow {
}
]
}
/*
layer.enabled: (settingsManager.appThemeCSD && Qt.platform.os !== "windows")
layer.effect: OpacityMask {
maskSource: Rectangle {
x: appBg.x
y: appBg.y
width: appBg.width
height: appBg.height
radius: 10

layer.enabled: (settingsManager.appThemeCSD && Qt.platform.os !== "windows")
layer.effect: MultiEffect {
maskEnabled: true
maskInverted: false
maskThresholdMin: 0.5
maskSpreadAtMin: 1.0
maskSpreadAtMax: 0.0
maskSource: ShaderEffectSource {
sourceItem: Rectangle {
x: appBg.x
y: appBg.y
width: appBg.width
height: appBg.height
radius: 10
}
/*
DragHandler {
// Resize the window without a compositor bar // Qt 5.15+
// Drag on the sidebar to drag the whole window // Qt 5.15+
Expand All @@ -313,9 +321,9 @@ ApplicationWindow {
}
}
}
*/
}
}
*/
}
}

Expand Down
3 changes: 1 addition & 2 deletions qml/ComponentLibrary/controls/SliderValueSolid.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ T.Slider {
color: control.colorForeground
}

layer.enabled: control.horizontal
layer.effect: MultiEffect {
MultiEffect {
maskEnabled: true
maskInverted: false
maskThresholdMin: 0.5
Expand Down
28 changes: 13 additions & 15 deletions qml/MediaDetailDetails.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,17 @@ Item {

Column {
anchors.top: parent.top
anchors.topMargin: 24
anchors.left: parent.left
anchors.leftMargin: 24
anchors.right: parent.right
anchors.rightMargin: 24
anchors.bottom: parent.bottom
anchors.bottomMargin: 24
anchors.margins: Theme.componentMarginXL

visible: shot.hasGoProMetadata
spacing: 16
spacing: Theme.componentMargin

Row {
height: 32
spacing: 16
spacing: Theme.componentMargin

visible: shot.camera

Expand Down Expand Up @@ -219,7 +216,7 @@ Item {
width: parent.width * 0.40
color: Theme.colorForeground

Rectangle { // shadow
Rectangle { // fake shadow
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
Expand All @@ -236,18 +233,19 @@ Item {

Column {
anchors.top: parent.top
anchors.topMargin: 24
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.bottomMargin: 24

topPadding: Theme.componentMarginXL
bottomPadding: Theme.componentMarginXL

Item {
height: 64
anchors.left: parent.left
anchors.leftMargin: 24
anchors.leftMargin: Theme.componentMarginXL
anchors.right: parent.right
anchors.rightMargin: 12
anchors.rightMargin: Theme.componentMarginXL/2

Text {
height: 32
Expand Down Expand Up @@ -287,9 +285,9 @@ Item {
Text {
height: 40
anchors.left: parent.left
anchors.leftMargin: 24
anchors.leftMargin: Theme.componentMarginXL
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin

text: (shot.fileCount > 1) ? qsTr("Files:") : qsTr("File:")
color: Theme.colorText
Expand All @@ -299,9 +297,9 @@ Item {
}

ListView {
height: infosFiles.height - 40 - 64 - 24
height: infosFiles.height - 40 - 64 - Theme.componentMarginXL
anchors.left: parent.left
anchors.leftMargin: 24
anchors.leftMargin: Theme.componentMarginXL
anchors.right: parent.right

clip: true
Expand Down
38 changes: 19 additions & 19 deletions qml/MediaDetailOverview.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ Item {
height: 28
width: infosGenericCol.width-48
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

text: shot.location
Expand All @@ -273,7 +273,7 @@ Item {
height: 28
width: infosGenericCol.width-48
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

text: shot.date.toUTCString()
Expand All @@ -296,7 +296,7 @@ Item {
id: duration
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand All @@ -318,7 +318,7 @@ Item {
id: camera
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

text: shot.camera
Expand All @@ -340,7 +340,7 @@ Item {
id: size
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

text: UtilsString.bytesToString_short(shot.datasize)
Expand All @@ -362,7 +362,7 @@ Item {
id: chapters
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand All @@ -387,7 +387,7 @@ Item {
Text {
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

text: shot.width + "x" + shot.height + " (" + UtilsMedia.varToString(shot.width, shot.height) + ")"
Expand All @@ -409,7 +409,7 @@ Item {
Text {
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

text: shot.widthVisible + "x" + shot.heightVisible + " (" + UtilsMedia.varToString(shot.widthVisible, shot.heightVisible) + ") [rotated]"
Expand All @@ -432,7 +432,7 @@ Item {
id: orientation
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

text: UtilsMedia.orientationQtToString(shot.transformation)
Expand Down Expand Up @@ -463,7 +463,7 @@ Item {
id: iso
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand All @@ -484,7 +484,7 @@ Item {
id: focal
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand All @@ -505,7 +505,7 @@ Item {
id: exposuretime
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand All @@ -526,7 +526,7 @@ Item {
id: meteringmode
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand All @@ -547,7 +547,7 @@ Item {
id: flash
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand Down Expand Up @@ -580,7 +580,7 @@ Item {
id: framerate
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand All @@ -601,7 +601,7 @@ Item {
id: codec
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand All @@ -622,7 +622,7 @@ Item {
id: bitrate
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand All @@ -643,7 +643,7 @@ Item {
id: audioChannels
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand All @@ -664,7 +664,7 @@ Item {
id: timecode
height: 28
anchors.left: parent.right
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

color: Theme.colorText
Expand Down
Loading

0 comments on commit 9fcc2f8

Please sign in to comment.