Skip to content

Commit

Permalink
Work on popups
Browse files Browse the repository at this point in the history
  • Loading branch information
@emericg
emericg committed Aug 12, 2024
1 parent 423ff93 commit 8b6200f
Show file tree
Hide file tree
Showing 10 changed files with 109 additions and 36 deletions.
16 changes: 15 additions & 1 deletion qml/popups/PopupDate.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Popup {

dim: true
modal: true
focus: true
focus: visible
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
parent: Overlay.overlay

Expand Down Expand Up @@ -138,6 +138,7 @@ Popup {
anchors.verticalCenter: parent.verticalCenter

text: qsTr("Change date and time")
textFormat: Text.PlainText
font.pixelSize: Theme.fontSizeTitle
font.bold: true
color: "white"
Expand Down Expand Up @@ -168,6 +169,7 @@ Popup {
anchors.right: parent.right

text: qsTr("File date")
textFormat: Text.PlainText
color: Theme.colorSubText
font.pixelSize: Theme.fontSizeContent
verticalAlignment: Text.AlignVCenter
Expand All @@ -178,6 +180,7 @@ Popup {
anchors.leftMargin: 140
anchors.verticalCenter: parent.verticalCenter

textFormat: Text.PlainText
color: Theme.colorText
font.pixelSize: Theme.fontSizeContent
verticalAlignment: Text.AlignVCenter
Expand Down Expand Up @@ -230,6 +233,7 @@ Popup {
visible: dateMetadata.text

text: qsTr("Metadata date")
textFormat: Text.PlainText
color: Theme.colorSubText
font.pixelSize: Theme.fontSizeContent
verticalAlignment: Text.AlignVCenter
Expand All @@ -240,6 +244,7 @@ Popup {
anchors.leftMargin: 140
anchors.verticalCenter: parent.verticalCenter

textFormat: Text.PlainText
color: Theme.colorText
font.pixelSize: Theme.fontSizeContent
verticalAlignment: Text.AlignVCenter
Expand Down Expand Up @@ -291,6 +296,7 @@ Popup {
visible: dateGps.text

text: qsTr("GPS date")
textFormat: Text.PlainText
color: Theme.colorSubText
font.pixelSize: Theme.fontSizeContent
verticalAlignment: Text.AlignVCenter
Expand All @@ -301,6 +307,7 @@ Popup {
anchors.leftMargin: 140
anchors.left: parent.left

textFormat: Text.PlainText
color: Theme.colorText
font.pixelSize: Theme.fontSizeContent
verticalAlignment: Text.AlignVCenter
Expand Down Expand Up @@ -352,6 +359,7 @@ Popup {
visible: dateUser.text

text: qsTr("User date")
textFormat: Text.PlainText
color: Theme.colorSubText
font.pixelSize: Theme.fontSizeContent
verticalAlignment: Text.AlignVCenter
Expand All @@ -362,6 +370,7 @@ Popup {
anchors.leftMargin: 140
anchors.left: parent.left

textFormat: Text.PlainText
color: Theme.colorText
font.pixelSize: Theme.fontSizeContent
verticalAlignment: Text.AlignVCenter
Expand Down Expand Up @@ -451,6 +460,7 @@ Popup {
Text {
id: elementYear
text: qsTr("Year")
textFormat: Text.PlainText
font.pixelSize: Theme.fontSizeContent
color: Theme.colorSubText
}
Expand All @@ -474,6 +484,7 @@ Popup {
Text {
id: elementMonth
text: qsTr("Month")
textFormat: Text.PlainText
font.pixelSize: Theme.fontSizeContent
color: Theme.colorSubText
}
Expand All @@ -496,6 +507,7 @@ Popup {
Text {
id: elementDay
text: qsTr("Day")
textFormat: Text.PlainText
font.pixelSize: Theme.fontSizeContent
color: Theme.colorSubText
}
Expand Down Expand Up @@ -525,6 +537,7 @@ Popup {
Text {
id: elementHours
text: qsTr("Hours")
textFormat: Text.PlainText
font.pixelSize: Theme.fontSizeContent
color: Theme.colorSubText
}
Expand All @@ -547,6 +560,7 @@ Popup {
Text {
id: elementMinutes
text: qsTr("Minutes")
textFormat: Text.PlainText
font.pixelSize: Theme.fontSizeContent
color: Theme.colorSubText
}
Expand Down
9 changes: 6 additions & 3 deletions qml/popups/PopupDelete.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Popup {

dim: true
modal: true
focus: true
focus: visible
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
parent: Overlay.overlay

Expand Down Expand Up @@ -176,6 +176,7 @@ Popup {
anchors.verticalCenter: parent.verticalCenter

text: qsTr("Confirmation")
textFormat: Text.PlainText
font.pixelSize: Theme.fontSizeTitle
font.bold: true
color: "white"
Expand All @@ -201,6 +202,7 @@ Popup {
anchors.verticalCenter: parent.verticalCenter

text: qsTr("%n shot(s) selected", "", shots_names.length) + " / " + qsTr("%n file(s) selected", "", shots_files.length)
textFormat: Text.PlainText
color: Theme.colorText
font.pixelSize: Theme.fontSizeContent
}
Expand Down Expand Up @@ -239,6 +241,7 @@ Popup {

visible: !recapOpened

textFormat: Text.PlainText
font.pixelSize: Theme.fontSizeContent
color: Theme.colorText
verticalAlignment: Text.AlignVCenter
Expand All @@ -249,7 +252,6 @@ Popup {
////////

ListView { // filesArea
id: listArea
anchors.left: parent.left
anchors.right: parent.right

Expand All @@ -259,8 +261,9 @@ Popup {

model: shots_files
delegate: Text {
width: listArea.width
width: ListView.view.width
text: modelData
textFormat: Text.PlainText
font.pixelSize: Theme.fontSizeContentSmall
elide: Text.ElideLeft
color: Theme.colorSubText
Expand Down
Loading

0 comments on commit 8b6200f

Please sign in to comment.