diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index d613bf9..d4d3d80 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -6,15 +6,15 @@ name: "CI builds"
on:
push:
pull_request:
+ workflow_dispatch:
#--------------------------------------------------------------------------------
# Define application name & version
#--------------------------------------------------------------------------------
env:
- VERSION: "0.10"
- APPLICATION: "MiniVideoInfos"
- QMAKE_PROJECT: "MiniVideoInfos.pro"
+ APP_NAME: "MiniVideoInfos"
+ APP_VERSION: "0.10"
QT_VERSION: "6.5.2"
#--------------------------------------------------------------------------------
@@ -57,5 +57,5 @@ jobs:
- name: Build application
run: |
qmake --version
- qmake ${{env.QMAKE_PROJECT}} DEFINES+=USE_CONTRIBS CONFIG+=release PREFIX=/usr
+ qmake ${{env.APP_NAME}}.pro DEFINES+=USE_CONTRIBS CONFIG+=release PREFIX=/usr
make -j$(nproc)
diff --git a/MiniVideoInfos.pro b/MiniVideoInfos.pro
index 303eba3..4adee6e 100644
--- a/MiniVideoInfos.pro
+++ b/MiniVideoInfos.pro
@@ -25,8 +25,6 @@ ios | android { DEFINES += USE_CONTRIBS }
# Use Qt Quick compiler
ios | android { CONFIG += qtquickcompiler }
-win32 { DEFINES += _USE_MATH_DEFINES }
-
# Project modules ##############################################################
# AppUtils
@@ -145,9 +143,11 @@ unix {
#QMAKE_LFLAGS += -fsanitize=address,undefined
}
+win32 { DEFINES += _USE_MATH_DEFINES }
+
DEFINES += QT_DEPRECATED_WARNINGS
-CONFIG(release, debug|release) : DEFINES += QT_NO_DEBUG_OUTPUT
+CONFIG(release, debug|release) : DEFINES += NDEBUG QT_NO_DEBUG QT_NO_DEBUG_OUTPUT
# Build artifacts ##############################################################
@@ -158,8 +158,8 @@ UI_DIR = build/$${QT_ARCH}/
DESTDIR = bin/
-################################################################################
-# Application deployment and installation steps
+
+# Application deployment steps #################################################
linux:!android {
TARGET = $$lower($${TARGET})
diff --git a/qml/MobileDrawer.qml b/qml/MobileDrawer.qml
index b77c5b8..bfb7724 100644
--- a/qml/MobileDrawer.qml
+++ b/qml/MobileDrawer.qml
@@ -3,30 +3,13 @@ import QtQuick.Controls
import ThemeEngine
-Drawer {
- width: (appWindow.screenOrientation === Qt.PortraitOrientation || appWindow.width < 480)
- ? 0.8 * appWindow.width : 0.5 * appWindow.width
- height: appWindow.height
-
- ////////////////////////////////////////////////////////////////////////////
-
- background: Rectangle {
- color: Theme.colorBackground
-
- Rectangle { // left border
- x: parent.width
- width: 1
- height: parent.height
- color: Theme.colorSeparator
- }
- }
-
- ////////////////////////////////////////////////////////////////////////////
-
+DrawerThemed {
contentItem: Item {
+ ////////////////
+
Column {
- id: rectangleHeader
+ id: headerColumn
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
@@ -34,8 +17,7 @@ Drawer {
////////
- Rectangle {
- id: rectangleStatusbar
+ Rectangle { // statusbar area
anchors.left: parent.left
anchors.right: parent.right
@@ -45,8 +27,7 @@ Drawer {
////////
- Rectangle {
- id: rectangleLogo
+ Rectangle { // header area
anchors.left: parent.left
anchors.right: parent.right
@@ -79,12 +60,14 @@ Drawer {
verticalAlignment: Text.AlignVCenter
}
}
+
+ ////////
}
////////////////
Flickable {
- anchors.top: rectangleHeader.bottom
+ anchors.top: headerColumn.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
@@ -99,6 +82,10 @@ Drawer {
////////
+ ListSeparatorPadded { }
+
+ ////////
+
DrawerItem {
highlighted: (appContent.state === "MediaList" && screenMediaList.dialogIsOpen)
text: qsTr("Open media")
@@ -168,7 +155,7 @@ Drawer {
////////
}
}
- }
- ////////////////////////////////////////////////////////////////////////////
+ ////////////////
+ }
}
diff --git a/qml/MobileMenu.qml b/qml/MobileMenu.qml
index e8b47e6..e551cc1 100644
--- a/qml/MobileMenu.qml
+++ b/qml/MobileMenu.qml
@@ -1,5 +1,4 @@
import QtQuick
-import QtQuick.Controls
import ThemeEngine
@@ -35,7 +34,7 @@ Item {
////////////////////////////////////////////////////////////////////////////
- Item { // main menu
+ Item { // menu area
id: mainmenu
anchors.top: parent.top
anchors.left: parent.left
diff --git a/qml/MobilePermissions.qml b/qml/MobilePermissions.qml
index 748d7b8..8791ff4 100644
--- a/qml/MobilePermissions.qml
+++ b/qml/MobilePermissions.qml
@@ -188,6 +188,23 @@ Item {
font.pixelSize: Theme.fontSizeContentSmall
}
+ ButtonWireframeIcon {
+ anchors.left: parent.left
+ anchors.leftMargin: appHeader.headerPosition
+ height: 36
+
+ visible: utilsApp.getAndroidSdkVersion() >= 30
+
+ primaryColor: Theme.colorPrimary
+ secondaryColor: Theme.colorBackground
+
+ text: qsTr("Permission info")
+ source: "qrc:/assets/icons_material/duotone-tune-24px.svg"
+ sourceSize: 20
+
+ onClicked: utilsApp.openAndroidStorageSettings("com.minivideo.infos")
+ }
+
////////
ListSeparatorPadded {
diff --git a/qml/components.qrc b/qml/components.qrc
index 4b585a8..2f7727d 100644
--- a/qml/components.qrc
+++ b/qml/components.qrc
@@ -60,6 +60,7 @@
components_themed/CheckBoxThemed.qml
components_themed/ComboBoxThemed.qml
components_themed/DialThemed.qml
+ components_themed/DrawerThemed.qml
components_themed/ItemDelegateThemed.qml
components_themed/MiddleSliderThemed.qml
components_themed/PageIndicatorThemed.qml
diff --git a/qml/components/TextEditMVI.qml b/qml/components/TextEditMVI.qml
index b224369..0493433 100644
--- a/qml/components/TextEditMVI.qml
+++ b/qml/components/TextEditMVI.qml
@@ -7,6 +7,8 @@ TextEdit {
readOnly: true
selectByMouse: isDesktop
selectionColor: Theme.colorPrimary
+ selectedTextColor: "white"
+
color: Theme.colorText
font.pixelSize: 15
wrapMode: Text.WrapAnywhere