diff --git a/app/mmstyle.h b/app/mmstyle.h index 1292127c5..781dfd00d 100644 --- a/app/mmstyle.h +++ b/app/mmstyle.h @@ -160,7 +160,7 @@ class MMStyle: public QObject QUrl calendarIcon() {return QUrl( "qrc:/Calendar.svg" );} QUrl showIcon() {return QUrl( "qrc:/Show.svg" );} QUrl hideIcon() {return QUrl( "qrc:/Hide.svg" );} - QUrl xMarkIcon() {return QUrl( "qrc:/X Mark..svg" );} + QUrl xMarkIcon() {return QUrl( "qrc:/X Mark.svg" );} QUrl errorIcon() {return QUrl( "qrc:/Error.svg" );} QUrl arrowUpIcon() {return QUrl( "qrc:/Arrow Up.svg" );} QUrl arrowDownIcon() {return QUrl( "qrc:/Arrow Down.svg" );} diff --git a/app/qmlV2/component/MMButton.qml b/app/qml/components/MMButton.qml similarity index 100% rename from app/qmlV2/component/MMButton.qml rename to app/qml/components/MMButton.qml diff --git a/app/qmlV2/component/MMButtonInput.qml b/app/qml/components/MMButtonInput.qml similarity index 100% rename from app/qmlV2/component/MMButtonInput.qml rename to app/qml/components/MMButtonInput.qml diff --git a/app/qmlV2/component/MMCheckBox.qml b/app/qml/components/MMCheckBox.qml similarity index 100% rename from app/qmlV2/component/MMCheckBox.qml rename to app/qml/components/MMCheckBox.qml diff --git a/app/qmlV2/component/MMComboBox.qml b/app/qml/components/MMComboBox.qml similarity index 100% rename from app/qmlV2/component/MMComboBox.qml rename to app/qml/components/MMComboBox.qml diff --git a/app/qmlV2/component/MMComponent_reachedDataLimit.qml b/app/qml/components/MMComponent_reachedDataLimit.qml similarity index 100% rename from app/qmlV2/component/MMComponent_reachedDataLimit.qml rename to app/qml/components/MMComponent_reachedDataLimit.qml diff --git a/app/qmlV2/component/MMDrawer.qml b/app/qml/components/MMDrawer.qml similarity index 100% rename from app/qmlV2/component/MMDrawer.qml rename to app/qml/components/MMDrawer.qml diff --git a/app/qmlV2/component/MMIcon.qml b/app/qml/components/MMIcon.qml similarity index 100% rename from app/qmlV2/component/MMIcon.qml rename to app/qml/components/MMIcon.qml diff --git a/app/qmlV2/component/MMInput.qml b/app/qml/components/MMInput.qml similarity index 100% rename from app/qmlV2/component/MMInput.qml rename to app/qml/components/MMInput.qml diff --git a/app/qmlV2/component/MMLink.qml b/app/qml/components/MMLink.qml similarity index 100% rename from app/qmlV2/component/MMLink.qml rename to app/qml/components/MMLink.qml diff --git a/app/qmlV2/component/MMLinkButton.qml b/app/qml/components/MMLinkButton.qml similarity index 100% rename from app/qmlV2/component/MMLinkButton.qml rename to app/qml/components/MMLinkButton.qml diff --git a/app/qmlV2/component/MMMapButton.qml b/app/qml/components/MMMapButton.qml similarity index 100% rename from app/qmlV2/component/MMMapButton.qml rename to app/qml/components/MMMapButton.qml diff --git a/app/qmlV2/component/MMMapLabel.qml b/app/qml/components/MMMapLabel.qml similarity index 100% rename from app/qmlV2/component/MMMapLabel.qml rename to app/qml/components/MMMapLabel.qml diff --git a/app/qmlV2/component/MMMenuDrawer.qml b/app/qml/components/MMMenuDrawer.qml similarity index 100% rename from app/qmlV2/component/MMMenuDrawer.qml rename to app/qml/components/MMMenuDrawer.qml diff --git a/app/qmlV2/component/MMNotification.qml b/app/qml/components/MMNotification.qml similarity index 100% rename from app/qmlV2/component/MMNotification.qml rename to app/qml/components/MMNotification.qml diff --git a/app/qmlV2/component/MMNotificationView.qml b/app/qml/components/MMNotificationView.qml similarity index 100% rename from app/qmlV2/component/MMNotificationView.qml rename to app/qml/components/MMNotificationView.qml diff --git a/app/qmlV2/component/MMPasswordInput.qml b/app/qml/components/MMPasswordInput.qml similarity index 100% rename from app/qmlV2/component/MMPasswordInput.qml rename to app/qml/components/MMPasswordInput.qml diff --git a/app/qmlV2/component/MMProgressBar.qml b/app/qml/components/MMProgressBar.qml similarity index 100% rename from app/qmlV2/component/MMProgressBar.qml rename to app/qml/components/MMProgressBar.qml diff --git a/app/qmlV2/component/MMRadioButton.qml b/app/qml/components/MMRadioButton.qml similarity index 100% rename from app/qmlV2/component/MMRadioButton.qml rename to app/qml/components/MMRadioButton.qml diff --git a/app/qmlV2/component/MMRoundButton.qml b/app/qml/components/MMRoundButton.qml similarity index 100% rename from app/qmlV2/component/MMRoundButton.qml rename to app/qml/components/MMRoundButton.qml diff --git a/app/qmlV2/component/MMRoundLinkButton.qml b/app/qml/components/MMRoundLinkButton.qml similarity index 100% rename from app/qmlV2/component/MMRoundLinkButton.qml rename to app/qml/components/MMRoundLinkButton.qml diff --git a/app/qmlV2/component/MMShadow.qml b/app/qml/components/MMShadow.qml similarity index 100% rename from app/qmlV2/component/MMShadow.qml rename to app/qml/components/MMShadow.qml diff --git a/app/qmlV2/component/MMSwitch.qml b/app/qml/components/MMSwitch.qml similarity index 100% rename from app/qmlV2/component/MMSwitch.qml rename to app/qml/components/MMSwitch.qml diff --git a/app/qmlV2/component/MMTextArea.qml b/app/qml/components/MMTextArea.qml similarity index 100% rename from app/qmlV2/component/MMTextArea.qml rename to app/qml/components/MMTextArea.qml diff --git a/app/qmlV2/component/MMToolbar.qml b/app/qml/components/MMToolbar.qml similarity index 100% rename from app/qmlV2/component/MMToolbar.qml rename to app/qml/components/MMToolbar.qml diff --git a/app/qmlV2/component/MMToolbarButton.qml b/app/qml/components/MMToolbarButton.qml similarity index 100% rename from app/qmlV2/component/MMToolbarButton.qml rename to app/qml/components/MMToolbarButton.qml diff --git a/app/qmlV2/component/MMToolbarLongButton.qml b/app/qml/components/MMToolbarLongButton.qml similarity index 100% rename from app/qmlV2/component/MMToolbarLongButton.qml rename to app/qml/components/MMToolbarLongButton.qml diff --git a/app/qmlV2/component/MMToolbarMenuButton.qml b/app/qml/components/MMToolbarMenuButton.qml similarity index 100% rename from app/qmlV2/component/MMToolbarMenuButton.qml rename to app/qml/components/MMToolbarMenuButton.qml diff --git a/app/qmlV2/icons/Arrow Link Right.svg b/app/qmlV2/icons/Arrow Link Right.svg deleted file mode 100644 index 5ed932c50..000000000 --- a/app/qmlV2/icons/Arrow Link Right.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/gallery/CMakeLists.txt b/gallery/CMakeLists.txt index 68b9c010b..df38b24ed 100644 --- a/gallery/CMakeLists.txt +++ b/gallery/CMakeLists.txt @@ -40,9 +40,6 @@ else () set(GALLERY_HDRS ${GALLERY_HDRS} hotreload.h) set(GALLERY_SRCS ${GALLERY_SRCS} hotreload.cpp) - - # todo: cp -r app/qmlV2 gallery/app/ - endif () qt_add_executable( diff --git a/gallery/app/qmlV2 b/gallery/app/qmlV2 deleted file mode 120000 index fa485c317..000000000 --- a/gallery/app/qmlV2 +++ /dev/null @@ -1 +0,0 @@ -../../app/qmlV2 \ No newline at end of file diff --git a/gallery/hotreload.cpp b/gallery/hotreload.cpp index 25ae73402..7b3870c9f 100644 --- a/gallery/hotreload.cpp +++ b/gallery/hotreload.cpp @@ -21,7 +21,7 @@ QString HotReload::syncScript() const echo running hot reload sync directories ... \n\ while true; do \n\ rsync -ra ../../../../gallery/qml/ HotReload/qml/ \n\ - rsync -ra ../../../../app/qmlV2/ HotReload/app/qmlV2/ \n\ + rsync -ra ../../../../app/qml/ HotReload/app/qml/ \n\ sleep 1 \n\ done"; } @@ -32,8 +32,8 @@ HotReload::HotReload( QQmlApplicationEngine &engine, QObject *parent ): // create dirs for sync (near the app) if ( !QDir( "HotReload/qml/" ).exists() ) QDir().mkpath( QGuiApplication::applicationDirPath() + "/HotReload/qml/" ); - if ( !QDir( "HotReload/app/qmlV2/" ).exists() ) - QDir().mkpath( QGuiApplication::applicationDirPath() + "/HotReload/app/qmlV2/" ); + if ( !QDir( "HotReload/app/qml/" ).exists() ) + QDir().mkpath( QGuiApplication::applicationDirPath() + "/HotReload/app/qml/" ); // create runnable sync script (near the app) QString scriptFilename = QGuiApplication::applicationDirPath() + "/syncGallery.sh"; @@ -69,8 +69,8 @@ void HotReload::startHotReload() { _watcher = new QFileSystemWatcher( this ); _watcher->addPath( "HotReload/qml/Pages" ); - _watcher->addPath( "HotReload/app/qmlV2" ); - _watcher->addPath( "HotReload/app/qmlV2/component" ); + _watcher->addPath( "HotReload/app/qml" ); + _watcher->addPath( "HotReload/app/qml/components" ); // send signal for hot reloading connect( _watcher, &QFileSystemWatcher::directoryChanged, this, [this]( const QString & path ) diff --git a/gallery/qml.qrc b/gallery/qml.qrc index b24a0a80c..14840713c 100644 --- a/gallery/qml.qrc +++ b/gallery/qml.qrc @@ -4,39 +4,39 @@ qml/pages/InitialGalleryPage.qml qml/pages/InputsPage.qml qml/pages/ButtonsPage.qml - ../app/qmlV2/component/MMInput.qml - ../app/qmlV2/component/MMButton.qml - ../app/qmlV2/component/MMLinkButton.qml - ../app/qmlV2/component/MMLink.qml - ../app/qmlV2/component/MMIcon.qml - ../app/qmlV2/component/MMRoundButton.qml - ../app/qmlV2/component/MMRoundLinkButton.qml + ../app/qml/components/MMInput.qml + ../app/qml/components/MMButton.qml + ../app/qml/components/MMLinkButton.qml + ../app/qml/components/MMLink.qml + ../app/qml/components/MMIcon.qml + ../app/qml/components/MMRoundButton.qml + ../app/qml/components/MMRoundLinkButton.qml qml/pages/TextAreaPage.qml - ../app/qmlV2/component/MMTextArea.qml + ../app/qml/components/MMTextArea.qml qml/pages/ComboBoxPage.qml - ../app/qmlV2/component/MMComboBox.qml - ../app/qmlV2/component/MMCheckBox.qml - ../app/qmlV2/component/MMRadioButton.qml - ../app/qmlV2/component/MMSwitch.qml + ../app/qml/components/MMComboBox.qml + ../app/qml/components/MMCheckBox.qml + ../app/qml/components/MMRadioButton.qml + ../app/qml/components/MMSwitch.qml qml/pages/NotificationPage.qml - ../app/qmlV2/component/MMNotification.qml - ../app/qmlV2/component/MMNotificationView.qml - ../app/qmlV2/component/MMDrawer.qml + ../app/qml/components/MMNotification.qml + ../app/qml/components/MMNotificationView.qml + ../app/qml/components/MMDrawer.qml qml/pages/DrawerPage.qml qml/pages/ChecksPage.qml - ../app/qmlV2/component/MMComponent_reachedDataLimit.qml - ../app/qmlV2/component/MMProgressBar.qml + ../app/qml/components/MMComponent_reachedDataLimit.qml + ../app/qml/components/MMProgressBar.qml qml/pages/MapPage.qml - ../app/qmlV2/component/MMMapButton.qml - ../app/qmlV2/component/MMShadow.qml - ../app/qmlV2/component/MMMapLabel.qml - ../app/qmlV2/component/MMPasswordInput.qml - ../app/qmlV2/component/MMButtonInput.qml - ../app/qmlV2/component/MMToolbarButton.qml - ../app/qmlV2/component/MMToolbar.qml + ../app/qml/components/MMMapButton.qml + ../app/qml/components/MMShadow.qml + ../app/qml/components/MMMapLabel.qml + ../app/qml/components/MMPasswordInput.qml + ../app/qml/components/MMButtonInput.qml + ../app/qml/components/MMToolbarButton.qml + ../app/qml/components/MMToolbar.qml qml/pages/ToolbarPage.qml - ../app/qmlV2/component/MMMenuDrawer.qml - ../app/qmlV2/component/MMToolbarMenuButton.qml - ../app/qmlV2/component/MMToolbarLongButton.qml + ../app/qml/components/MMMenuDrawer.qml + ../app/qml/components/MMToolbarMenuButton.qml + ../app/qml/components/MMToolbarLongButton.qml diff --git a/gallery/qml/pages/ButtonsPage.qml b/gallery/qml/pages/ButtonsPage.qml index 07ddd8752..81debb1eb 100644 --- a/gallery/qml/pages/ButtonsPage.qml +++ b/gallery/qml/pages/ButtonsPage.qml @@ -11,7 +11,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic -import "../../app/qmlV2/component" +import "../../app/qml/components" Column { padding: 20 diff --git a/gallery/qml/pages/ChecksPage.qml b/gallery/qml/pages/ChecksPage.qml index 6ddb80cba..6c1ce2993 100644 --- a/gallery/qml/pages/ChecksPage.qml +++ b/gallery/qml/pages/ChecksPage.qml @@ -11,7 +11,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic -import "../../app/qmlV2/component" +import "../../app/qml/components" Column { padding: 20 diff --git a/gallery/qml/pages/ComboBoxPage.qml b/gallery/qml/pages/ComboBoxPage.qml index aedb07780..a37984cc8 100644 --- a/gallery/qml/pages/ComboBoxPage.qml +++ b/gallery/qml/pages/ComboBoxPage.qml @@ -11,7 +11,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic -import "../../app/qmlV2/component" +import "../../app/qml/components" Column { padding: 20 diff --git a/gallery/qml/pages/DrawerPage.qml b/gallery/qml/pages/DrawerPage.qml index 267c413cb..8dec758a9 100644 --- a/gallery/qml/pages/DrawerPage.qml +++ b/gallery/qml/pages/DrawerPage.qml @@ -11,8 +11,8 @@ import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic -import "../../app/qmlV2/component" -import "../../app/qmlV2" +import "../../app/qml/components" +import "../../app/qml" Page { id: pane diff --git a/gallery/qml/pages/InitialGalleryPage.qml b/gallery/qml/pages/InitialGalleryPage.qml index c6e0b96e5..4069945be 100644 --- a/gallery/qml/pages/InitialGalleryPage.qml +++ b/gallery/qml/pages/InitialGalleryPage.qml @@ -13,7 +13,6 @@ import QtQuick.Controls Page { id: pane - //FontLoader { id: fontx; source: "qrc:/fonts/SquarePeg-Regular.ttf" } Label { width: parent.width / 2 text: "DP ratio: ~" + Math.round(__dp * 1000) / 1000 + "\n" + @@ -25,6 +24,5 @@ Page { color: "red" font.family: "Inter" font.pixelSize: 20 - //font.family: fontx.font.family } } diff --git a/gallery/qml/pages/InputsPage.qml b/gallery/qml/pages/InputsPage.qml index 30cfb50aa..7aa1ec2bf 100644 --- a/gallery/qml/pages/InputsPage.qml +++ b/gallery/qml/pages/InputsPage.qml @@ -11,8 +11,8 @@ import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic -import "../../app/qmlV2/component" -import "../../app/qmlV2/" +import "../../app/qml/components" +import "../../app/qml/" ScrollView { Column { diff --git a/gallery/qml/pages/MapPage.qml b/gallery/qml/pages/MapPage.qml index 88dde5862..544976b04 100644 --- a/gallery/qml/pages/MapPage.qml +++ b/gallery/qml/pages/MapPage.qml @@ -13,8 +13,8 @@ import QtQuick.Controls.Basic import QtLocation import QtPositioning -import "../../app/qmlV2/component" -import "../../app/qmlV2/" +import "../../app/qml/components" +import "../../app/qml/" Page { id: pane diff --git a/gallery/qml/pages/NotificationPage.qml b/gallery/qml/pages/NotificationPage.qml index 49bb14e2b..3651e2792 100644 --- a/gallery/qml/pages/NotificationPage.qml +++ b/gallery/qml/pages/NotificationPage.qml @@ -11,7 +11,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic -import "../../app/qmlV2/component" +import "../../app/qml/components" import notificationType 1.0 Page { diff --git a/gallery/qml/pages/TextAreaPage.qml b/gallery/qml/pages/TextAreaPage.qml index 8ebef16c6..e62a4cdd4 100644 --- a/gallery/qml/pages/TextAreaPage.qml +++ b/gallery/qml/pages/TextAreaPage.qml @@ -11,7 +11,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Controls.Basic -import "../../app/qmlV2/component" +import "../../app/qml/components" Column { padding: 20 diff --git a/gallery/qml/pages/ToolbarPage.qml b/gallery/qml/pages/ToolbarPage.qml index d460725bd..61b26d5cd 100644 --- a/gallery/qml/pages/ToolbarPage.qml +++ b/gallery/qml/pages/ToolbarPage.qml @@ -10,8 +10,8 @@ import QtQuick import QtQuick.Controls -import "../../app/qmlV2/component" -import "../../app/qmlV2/" +import "../../app/qml/components" +import "../../app/qml/" Page { id: pane @@ -47,9 +47,9 @@ Page { MMToolbar { model: ObjectModel { - MMToolbarButton { text: qsTr("Delete"); iconSource: __style.deleteIcon; onClicked: console.log("tapped "+text) } - MMToolbarButton { text: qsTr("Edit Geometry"); iconSource: __style.editIcon; onClicked: console.log("tapped "+text) } - MMToolbarButton { text: qsTr("Save"); iconSource: __style.doneIcon; type: MMToolbarButton.Button.Save; onClicked: console.log("tapped "+text) } + MMToolbarButton { text: "Delete"; iconSource: __style.deleteIcon; onClicked: console.log("tapped "+text) } + MMToolbarButton { text: "Edit Geometry"; iconSource: __style.editIcon; onClicked: console.log("tapped "+text) } + MMToolbarButton { text: "Save"; iconSource: __style.doneIcon; type: MMToolbarButton.Button.Save; onClicked: console.log("tapped "+text) } } } }