Skip to content

Commit

Permalink
move qmlv2 to qml folder
Browse files Browse the repository at this point in the history
  • Loading branch information
@PeterPetrik
PeterPetrik committed Dec 1, 2023
1 parent 9f2cf72 commit 05afd4f
Show file tree
Hide file tree
Showing 43 changed files with 49 additions and 60 deletions.
2 changes: 1 addition & 1 deletion app/mmstyle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" );}
Expand Down
0 app/qmlV2/component/MMButton.qml → app/qml/components/MMButton.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMButtonInput.qml → app/qml/components/MMButtonInput.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMCheckBox.qml → app/qml/components/MMCheckBox.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMComboBox.qml → app/qml/components/MMComboBox.qml
View file
File renamed without changes.
0 ...omponent/MMComponent_reachedDataLimit.qml → ...mponents/MMComponent_reachedDataLimit.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMDrawer.qml → app/qml/components/MMDrawer.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMIcon.qml → app/qml/components/MMIcon.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMInput.qml → app/qml/components/MMInput.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMLink.qml → app/qml/components/MMLink.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMLinkButton.qml → app/qml/components/MMLinkButton.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMMapButton.qml → app/qml/components/MMMapButton.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMMapLabel.qml → app/qml/components/MMMapLabel.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMMenuDrawer.qml → app/qml/components/MMMenuDrawer.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMNotification.qml → app/qml/components/MMNotification.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMNotificationView.qml → app/qml/components/MMNotificationView.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMPasswordInput.qml → app/qml/components/MMPasswordInput.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMProgressBar.qml → app/qml/components/MMProgressBar.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMRadioButton.qml → app/qml/components/MMRadioButton.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMRoundButton.qml → app/qml/components/MMRoundButton.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMRoundLinkButton.qml → app/qml/components/MMRoundLinkButton.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMShadow.qml → app/qml/components/MMShadow.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMSwitch.qml → app/qml/components/MMSwitch.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMTextArea.qml → app/qml/components/MMTextArea.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMToolbar.qml → app/qml/components/MMToolbar.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMToolbarButton.qml → app/qml/components/MMToolbarButton.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMToolbarLongButton.qml → app/qml/components/MMToolbarLongButton.qml
View file
File renamed without changes.
0 app/qmlV2/component/MMToolbarMenuButton.qml → app/qml/components/MMToolbarMenuButton.qml
View file
File renamed without changes.
5 changes: 0 additions & 5 deletions app/qmlV2/icons/Arrow Link Right.svg
View file

This file was deleted.

3 changes: 0 additions & 3 deletions gallery/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion gallery/app/qmlV2
View file

This file was deleted.

10 changes: 5 additions & 5 deletions gallery/hotreload.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand All @@ -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";
Expand Down Expand Up @@ -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 )
Expand Down
54 changes: 27 additions & 27 deletions gallery/qml.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,39 @@
<file>qml/pages/InitialGalleryPage.qml</file>
<file>qml/pages/InputsPage.qml</file>
<file>qml/pages/ButtonsPage.qml</file>
<file>../app/qmlV2/component/MMInput.qml</file>
<file>../app/qmlV2/component/MMButton.qml</file>
<file>../app/qmlV2/component/MMLinkButton.qml</file>
<file>../app/qmlV2/component/MMLink.qml</file>
<file>../app/qmlV2/component/MMIcon.qml</file>
<file>../app/qmlV2/component/MMRoundButton.qml</file>
<file>../app/qmlV2/component/MMRoundLinkButton.qml</file>
<file>../app/qml/components/MMInput.qml</file>
<file>../app/qml/components/MMButton.qml</file>
<file>../app/qml/components/MMLinkButton.qml</file>
<file>../app/qml/components/MMLink.qml</file>
<file>../app/qml/components/MMIcon.qml</file>
<file>../app/qml/components/MMRoundButton.qml</file>
<file>../app/qml/components/MMRoundLinkButton.qml</file>
<file>qml/pages/TextAreaPage.qml</file>
<file>../app/qmlV2/component/MMTextArea.qml</file>
<file>../app/qml/components/MMTextArea.qml</file>
<file>qml/pages/ComboBoxPage.qml</file>
<file>../app/qmlV2/component/MMComboBox.qml</file>
<file>../app/qmlV2/component/MMCheckBox.qml</file>
<file>../app/qmlV2/component/MMRadioButton.qml</file>
<file>../app/qmlV2/component/MMSwitch.qml</file>
<file>../app/qml/components/MMComboBox.qml</file>
<file>../app/qml/components/MMCheckBox.qml</file>
<file>../app/qml/components/MMRadioButton.qml</file>
<file>../app/qml/components/MMSwitch.qml</file>
<file>qml/pages/NotificationPage.qml</file>
<file>../app/qmlV2/component/MMNotification.qml</file>
<file>../app/qmlV2/component/MMNotificationView.qml</file>
<file>../app/qmlV2/component/MMDrawer.qml</file>
<file>../app/qml/components/MMNotification.qml</file>
<file>../app/qml/components/MMNotificationView.qml</file>
<file>../app/qml/components/MMDrawer.qml</file>
<file>qml/pages/DrawerPage.qml</file>
<file>qml/pages/ChecksPage.qml</file>
<file>../app/qmlV2/component/MMComponent_reachedDataLimit.qml</file>
<file>../app/qmlV2/component/MMProgressBar.qml</file>
<file>../app/qml/components/MMComponent_reachedDataLimit.qml</file>
<file>../app/qml/components/MMProgressBar.qml</file>
<file>qml/pages/MapPage.qml</file>
<file>../app/qmlV2/component/MMMapButton.qml</file>
<file>../app/qmlV2/component/MMShadow.qml</file>
<file>../app/qmlV2/component/MMMapLabel.qml</file>
<file>../app/qmlV2/component/MMPasswordInput.qml</file>
<file>../app/qmlV2/component/MMButtonInput.qml</file>
<file>../app/qmlV2/component/MMToolbarButton.qml</file>
<file>../app/qmlV2/component/MMToolbar.qml</file>
<file>../app/qml/components/MMMapButton.qml</file>
<file>../app/qml/components/MMShadow.qml</file>
<file>../app/qml/components/MMMapLabel.qml</file>
<file>../app/qml/components/MMPasswordInput.qml</file>
<file>../app/qml/components/MMButtonInput.qml</file>
<file>../app/qml/components/MMToolbarButton.qml</file>
<file>../app/qml/components/MMToolbar.qml</file>
<file>qml/pages/ToolbarPage.qml</file>
<file>../app/qmlV2/component/MMMenuDrawer.qml</file>
<file>../app/qmlV2/component/MMToolbarMenuButton.qml</file>
<file>../app/qmlV2/component/MMToolbarLongButton.qml</file>
<file>../app/qml/components/MMMenuDrawer.qml</file>
<file>../app/qml/components/MMToolbarMenuButton.qml</file>
<file>../app/qml/components/MMToolbarLongButton.qml</file>
</qresource>
</RCC>
2 changes: 1 addition & 1 deletion gallery/qml/pages/ButtonsPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic

import "../../app/qmlV2/component"
import "../../app/qml/components"

Column {
padding: 20
Expand Down
2 changes: 1 addition & 1 deletion gallery/qml/pages/ChecksPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic

import "../../app/qmlV2/component"
import "../../app/qml/components"

Column {
padding: 20
Expand Down
2 changes: 1 addition & 1 deletion gallery/qml/pages/ComboBoxPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic

import "../../app/qmlV2/component"
import "../../app/qml/components"

Column {
padding: 20
Expand Down
4 changes: 2 additions & 2 deletions gallery/qml/pages/DrawerPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions gallery/qml/pages/InitialGalleryPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand All @@ -25,6 +24,5 @@ Page {
color: "red"
font.family: "Inter"
font.pixelSize: 20
//font.family: fontx.font.family
}
}
4 changes: 2 additions & 2 deletions gallery/qml/pages/InputsPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions gallery/qml/pages/MapPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gallery/qml/pages/NotificationPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gallery/qml/pages/TextAreaPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic

import "../../app/qmlV2/component"
import "../../app/qml/components"

Column {
padding: 20
Expand Down
10 changes: 5 additions & 5 deletions gallery/qml/pages/ToolbarPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) }
}
}
}

1 comment on commit 05afd4f

@inputapp-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS - version 23.12.491711 just submitted!

Please sign in to comment.