From 49e96980f124381410b3e6f34cd1c9c1737178d0 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 9 Oct 2018 17:11:01 +0200
Subject: [PATCH] Store the dialogs in a folder called Dialogs.

Contributes to CURA-5784.
---
 resources/qml/{Accounts => Account}/AccountWidget.qml           | 0
 resources/qml/{Accounts => Account}/AvatarImage.qml             | 0
 resources/qml/{Accounts => Account}/GeneralManagementWidget.qml | 0
 resources/qml/{Accounts => Account}/UserManagementWidget.qml    | 0
 resources/qml/Cura.qml                                          | 1 +
 resources/qml/{ => Dialogs}/AboutDialog.qml                     | 0
 resources/qml/{ => Dialogs}/AddMachineDialog.qml                | 0
 resources/qml/{ => Dialogs}/AskOpenAsProjectOrModelsDialog.qml  | 0
 .../qml/{ => Dialogs}/DiscardOrKeepProfileChangesDialog.qml     | 0
 .../qml/{ => Dialogs}/OpenFilesIncludingProjectsDialog.qml      | 0
 resources/qml/Menus/RecentFilesMenu.qml                         | 2 ++
 resources/qml/Skeleton/TopHeader.qml                            | 2 +-
 12 files changed, 4 insertions(+), 1 deletion(-)
 rename resources/qml/{Accounts => Account}/AccountWidget.qml (100%)
 rename resources/qml/{Accounts => Account}/AvatarImage.qml (100%)
 rename resources/qml/{Accounts => Account}/GeneralManagementWidget.qml (100%)
 rename resources/qml/{Accounts => Account}/UserManagementWidget.qml (100%)
 rename resources/qml/{ => Dialogs}/AboutDialog.qml (100%)
 rename resources/qml/{ => Dialogs}/AddMachineDialog.qml (100%)
 rename resources/qml/{ => Dialogs}/AskOpenAsProjectOrModelsDialog.qml (100%)
 rename resources/qml/{ => Dialogs}/DiscardOrKeepProfileChangesDialog.qml (100%)
 rename resources/qml/{ => Dialogs}/OpenFilesIncludingProjectsDialog.qml (100%)

diff --git a/resources/qml/Accounts/AccountWidget.qml b/resources/qml/Account/AccountWidget.qml
similarity index 100%
rename from resources/qml/Accounts/AccountWidget.qml
rename to resources/qml/Account/AccountWidget.qml
diff --git a/resources/qml/Accounts/AvatarImage.qml b/resources/qml/Account/AvatarImage.qml
similarity index 100%
rename from resources/qml/Accounts/AvatarImage.qml
rename to resources/qml/Account/AvatarImage.qml
diff --git a/resources/qml/Accounts/GeneralManagementWidget.qml b/resources/qml/Account/GeneralManagementWidget.qml
similarity index 100%
rename from resources/qml/Accounts/GeneralManagementWidget.qml
rename to resources/qml/Account/GeneralManagementWidget.qml
diff --git a/resources/qml/Accounts/UserManagementWidget.qml b/resources/qml/Account/UserManagementWidget.qml
similarity index 100%
rename from resources/qml/Accounts/UserManagementWidget.qml
rename to resources/qml/Account/UserManagementWidget.qml
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 16bae8aa3b..2af085fee7 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -10,6 +10,7 @@ import QtQuick.Dialogs 1.2
 import UM 1.3 as UM
 import Cura 1.1 as Cura
 
+import "Dialogs"
 import "Menus"
 import "Skeleton"
 
diff --git a/resources/qml/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml
similarity index 100%
rename from resources/qml/AboutDialog.qml
rename to resources/qml/Dialogs/AboutDialog.qml
diff --git a/resources/qml/AddMachineDialog.qml b/resources/qml/Dialogs/AddMachineDialog.qml
similarity index 100%
rename from resources/qml/AddMachineDialog.qml
rename to resources/qml/Dialogs/AddMachineDialog.qml
diff --git a/resources/qml/AskOpenAsProjectOrModelsDialog.qml b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
similarity index 100%
rename from resources/qml/AskOpenAsProjectOrModelsDialog.qml
rename to resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
similarity index 100%
rename from resources/qml/DiscardOrKeepProfileChangesDialog.qml
rename to resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
diff --git a/resources/qml/OpenFilesIncludingProjectsDialog.qml b/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml
similarity index 100%
rename from resources/qml/OpenFilesIncludingProjectsDialog.qml
rename to resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml
diff --git a/resources/qml/Menus/RecentFilesMenu.qml b/resources/qml/Menus/RecentFilesMenu.qml
index 12f53fb517..0f1f67b6fa 100644
--- a/resources/qml/Menus/RecentFilesMenu.qml
+++ b/resources/qml/Menus/RecentFilesMenu.qml
@@ -7,6 +7,8 @@ import QtQuick.Controls 1.1
 import UM 1.3 as UM
 import Cura 1.0 as Cura
 
+import "../Dialogs"
+
 Menu
 {
     id: menu
diff --git a/resources/qml/Skeleton/TopHeader.qml b/resources/qml/Skeleton/TopHeader.qml
index fedb00898f..5013c12703 100644
--- a/resources/qml/Skeleton/TopHeader.qml
+++ b/resources/qml/Skeleton/TopHeader.qml
@@ -8,7 +8,7 @@ import QtQuick.Controls.Styles 1.1
 import UM 1.4 as UM
 import Cura 1.0 as Cura
 
-import "../Accounts"
+import "../Account"
 
 Rectangle
 {