Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

map, form, gps folders rename #3108

Merged
merged 2 commits into from
Mar 5, 2024
Merged

map, form, gps folders rename #3108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65cb8b7
rename files in form
PeterPetrik Mar 5, 2024
17897cc
map rename files
PeterPetrik Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions app/qml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ set(MM_QML
dialogs/MMStorageLimitDialog.qml
dialogs/MMStreamingModeDialog.qml
dialogs/MMSyncFailedDialog.qml
form/MMForm.qml
form/MMFormStackManager.qml
form/MMFormWrapper.qml
form/MMPreviewPanel.qml
form/MMFormPage.qml
form/MMFormStackController.qml
form/MMFormController.qml
form/MMPreviewDrawer.qml
form/components/MMFormTabBar.qml
form/components/MMPreviewPanelActionButton.qml
form/components/MMPreviewActionButton.qml
form/editors/MMFormCalendarEditor.qml
form/editors/MMFormGalleryEditor.qml
form/editors/MMFormNumberEditor.qml
Expand Down Expand Up @@ -112,16 +112,15 @@ set(MM_QML
inputs/MMTextInput.qml
inputs/MMTextWithButtonInput.qml
layers/MMFeaturesListPage.qml
layers/MMLayerDetail.qml
layers/MMLayerDetailPage.qml
layers/MMLayersList.qml
layers/MMLayersListPage.qml
layers/MMLayersListSearchPage.qml
layers/MMLayersPanel.qml
layers/MMLayersController.qml
map/MMHighlight.qml
map/MMMapCanvas.qml
map/MMMapThemeDrawer.qml
map/MMMapWrapper.qml
map/MMPositionMarker.qml
map/MMMapController.qml
map/MMSplittingTools.qml
map/MMStakeoutTools.qml
map/MMRecordingTools.qml
Expand All @@ -133,6 +132,7 @@ set(MM_QML
map/components/MMMapLabel.qml
map/components/MMMapPicker.qml
map/components/MMMapScaleBar.qml
map/components/MMPositionMarker.qml
project/MMProjectIssuesPage.qml
project/MMProjectStatusPage.qml
project/MMProjectHomeTab.qml
Expand Down
4 changes: 2 additions & 2 deletions app/qml/form/MMFormWrapper.qml → app/qml/form/MMFormController.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Item {
statesManager.state = "closed"
}

MMPreviewPanel {
MMPreviewDrawer {
id: previewPanel

layerIsReadOnly: root.layerIsReadOnly
Expand All @@ -163,7 +163,7 @@ Item {
}
}

MMForm {
MMFormPage {
id: featureForm

anchors.fill: parent
Expand Down
0 app/qml/form/MMForm.qml → app/qml/form/MMFormPage.qml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/qml/form/MMFormStackManager.qml → app/qml/form/MMFormStackController.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ Item {
Component {
id: formComponent

MMFormWrapper {
MMFormController {
id: wrapper

project: root.project
Expand Down
4 changes: 2 additions & 2 deletions app/qml/form/MMPreviewPanel.qml → app/qml/form/MMPreviewDrawer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ Item {
height: parent.height
spacing: 12 * __dp

FormComponents.MMPreviewPanelActionButton {
FormComponents.MMPreviewActionButton {
height: parent.height

visible: !root.layerIsReadOnly
Expand All @@ -191,7 +191,7 @@ Item {
onClicked: root.editClicked()
}

FormComponents.MMPreviewPanelActionButton {
FormComponents.MMPreviewActionButton {
height: parent.height

visible: __inputUtils.isPointLayerFeature( controller.featureLayerPair )
Expand Down
0 ...components/MMPreviewPanelActionButton.qml → ...form/components/MMPreviewActionButton.qml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/qml/gps/MMStakeoutPanel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import QtQuick.Shapes
import mm 1.0 as MM

import "../components"
import "../map"
import "../map/components"

MMDrawer {
id: root
Expand Down
0 app/qml/layers/MMLayerDetail.qml → app/qml/layers/MMLayerDetailPage.qml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/qml/layers/MMLayersPanel.qml → app/qml/layers/MMLayersController.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Item {
Component {
id: layerDetailsPage

MMLayerDetail {
MMLayerDetailPage {
onClose: function() {
if (pagesStackView.depth > 1) {
pagesStackView.pop( StackView.PopTransition )
Expand Down
6 changes: 3 additions & 3 deletions app/qml/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ ApplicationWindow {
console.log("Application initialized!")
}

MMMapWrapper {
MMMapController {
id: map

height: window.height - mapToolbar.height
Expand Down Expand Up @@ -481,7 +481,7 @@ ApplicationWindow {
Component {
id: layersPanelComponent

MMLayersPanel {
MMLayersController {

onClose: function() {
mapPanelsStackView.clear( StackView.PopTransition )
Expand Down Expand Up @@ -664,7 +664,7 @@ ApplicationWindow {
}
}

MMFormStackManager {
MMFormStackController {
id: formsStackManager

height: window.height
Expand Down
0 app/qml/map/MMMapWrapper.qml → app/qml/map/MMMapController.qml
View file
Open in desktop
File renamed without changes.
0 app/qml/map/MMPositionMarker.qml → app/qml/map/components/MMPositionMarker.qml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gallery/qml.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<file>../app/qml/form/editors/MMFormSpacer.qml</file>
<file>../app/qml/form/editors/MMFormRichTextViewer.qml</file>
<file>../app/qml/form/editors/MMFormRelationReferenceEditor.qml</file>
<file>../app/qml/map/MMPositionMarker.qml</file>
<file>../app/qml/map/components/MMPositionMarker.qml</file>
<file>../app/qml/map/components/MMBlurBox.qml</file>
<file>../app/qml/map/components/MMMapLoadingIndicator.qml</file>
<file>../app/qml/map/components/MMMapBlurLabel.qml</file>
Expand Down
Loading