Moves qml files to a folder or their own

DannyGB · Nov 16, 2018 · 8fe23ec · 8fe23ec
1 parent efb3f26
commit 8fe23ec
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 31 deletions.
diff --git a/KeePit.pro b/KeePit.pro
@@ -22,7 +22,7 @@ UBUNTU_TRANSLATION_DOMAIN="keepit.dannygb"
 # template is created in po/template.pot, to create a
 # translation copy the template to e.g. de.po and edit the sources
 UBUNTU_TRANSLATION_SOURCES+= \
-    $$files(*.qml,true) \
+    $$files(qml/*.qml,true) \
     $$files(*.js,true) \
     $$files(*.desktop,true)
 

diff --git a/KeePit/KeePit.pro b/KeePit/KeePit.pro
@@ -5,7 +5,7 @@ load(ubuntu-click)
 
 QT += qml quick
 
-SOURCES += main.cpp \    
+SOURCES += main.cpp \
     backend.cpp \
     compositekey.cpp \
     hashedblockstream.cpp \
@@ -146,11 +146,11 @@ SOURCES += main.cpp \
     arrayextensions.cpp \
     aes.cpp \
     filehandler.cpp \
-    bytestream.cpp \   
+    bytestream.cpp \
 
 RESOURCES += KeePit.qrc
 
-QML_FILES += $$files(*.qml,true) \
+QML_FILES += $$files(qml/*.qml,true) \
              $$files(*.js,true)
 
 CONF_FILES +=  KeePit.apparmor \
@@ -170,7 +170,7 @@ config_files.path = /KeePit
 config_files.files += $${CONF_FILES}
 INSTALLS+=config_files
 
-#install the desktop file, a translated version is 
+#install the desktop file, a translated version is
 #automatically created in the build directory
 desktop_file.path = /KeePit
 desktop_file.files = $$OUT_PWD/KeePit.desktop
@@ -189,7 +189,7 @@ HEADERS += \
     readxmlfile.h \
     salsa20.h \
     sha256.h \
-    tinyxml2.h \ 
+    tinyxml2.h \
     cryptopp/zlib.h \
     cryptopp/zinflate.h \
     cryptopp/zdeflate.h \
@@ -333,16 +333,16 @@ HEADERS += \
     arrayextensions.h \
     aes.h \
     filehandler.h \
-    bytestream.h \  
+    bytestream.h \
     stdafx.h
 
 DISTFILES += \
-    OpenDatabase.qml \
-    Entry.qml \
-    EntryModel.qml \
-    ListEntryItems.qml \
-    Selector.qml \
-    Importer.qml \
+    qml/OpenDatabase.qml \
+    qml/Entry.qml \
+    qml/EntryModel.qml \
+    qml/ListEntryItems.qml \
+    qml/Selector.qml \
+    qml/Importer.qml \
     cryptopp/cryptest.exe \
     cryptopp/strciphr.o \
     cryptopp/polynomi.o \
@@ -355,9 +355,9 @@ DISTFILES += \
     KeePit.png \
     KeePit.contenthub \
     KeePit.apparmor \
-    CreateDatabase.qml \
-    KeySelector.qml \
-    PasswordInput.qml
+    qml/CreateDatabase.qml \
+    qml/KeySelector.qml \
+    qml/PasswordInput.qml
 
 LIBS += -L$$OUT_PWD/../ziplib/ -lziplib
 

diff --git a/KeePit/KeePit.qrc b/KeePit/KeePit.qrc
@@ -1,32 +1,32 @@
 <RCC>
     <qresource prefix="/">
-        <file>Main.qml</file>
+        <file>qml/Main.qml</file>
     </qresource>
     <qresource prefix="/">
-        <file>KeySelector.qml</file>
-    </qresource>    
+        <file>qml/KeySelector.qml</file>
+    </qresource>
     <qresource prefix="/">
-        <file>CreateDatabase.qml</file>
+        <file>qml/CreateDatabase.qml</file>
     </qresource>
     <qresource prefix="/">
-        <file>OpenDatabase.qml</file>
+        <file>qml/OpenDatabase.qml</file>
     </qresource>
-	    <qresource prefix="/">
-        <file>Entry.qml</file>
+    <qresource prefix="/">
+    <file>qml/Entry.qml</file>
     </qresource>
     <qresource prefix="/">
-        <file>EntryModel.qml</file>
+        <file>qml/EntryModel.qml</file>
     </qresource>
     <qresource prefix="/">
-        <file>ListEntryItems.qml</file>
+        <file>qml/ListEntryItems.qml</file>
     </qresource>
     <qresource prefix="/">
-        <file>Selector.qml</file>
+        <file>qml/Selector.qml</file>
     </qresource>
     <qresource prefix="/">
-        <file>Importer.qml</file>
+        <file>qml/Importer.qml</file>
     </qresource>
     <qresource prefix="/">
-        <file>PasswordInput.qml</file>
+        <file>qml/PasswordInput.qml</file>
     </qresource>
 </RCC>
diff --git a/KeePit/main.cpp b/KeePit/main.cpp
@@ -33,7 +33,7 @@
 /// \return
 ///
 int main(int argc, char *argv[])
-{   
+{
     QGuiApplication app(argc, argv);
 
     Database fs;
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<Database>("KeePass3", 1, 0, "Database");
 
     QQuickView view;
-    view.setSource(QUrl(QStringLiteral("qrc:///Main.qml")));
+    view.setSource(QUrl(QStringLiteral("qrc:///qml//Main.qml")));
     view.setResizeMode(QQuickView::SizeRootObjectToView);
 
     QQmlContext *ctxt = view.rootContext();

diff --git a/KeePit/CreateDatabase.qml → KeePit/qml/CreateDatabase.qml b/KeePit/CreateDatabase.qml → KeePit/qml/CreateDatabase.qml
diff --git a/KeePit/Entry.qml → KeePit/qml/Entry.qml b/KeePit/Entry.qml → KeePit/qml/Entry.qml
diff --git a/KeePit/EntryModel.qml → KeePit/qml/EntryModel.qml b/KeePit/EntryModel.qml → KeePit/qml/EntryModel.qml
diff --git a/KeePit/Importer.qml → KeePit/qml/Importer.qml b/KeePit/Importer.qml → KeePit/qml/Importer.qml
diff --git a/KeePit/KeySelector.qml → KeePit/qml/KeySelector.qml b/KeePit/KeySelector.qml → KeePit/qml/KeySelector.qml
diff --git a/KeePit/ListEntryItems.qml → KeePit/qml/ListEntryItems.qml b/KeePit/ListEntryItems.qml → KeePit/qml/ListEntryItems.qml
diff --git a/KeePit/Main.qml → KeePit/qml/Main.qml b/KeePit/Main.qml → KeePit/qml/Main.qml
diff --git a/KeePit/OpenDatabase.qml → KeePit/qml/OpenDatabase.qml b/KeePit/OpenDatabase.qml → KeePit/qml/OpenDatabase.qml
diff --git a/KeePit/PasswordInput.qml → KeePit/qml/PasswordInput.qml b/KeePit/PasswordInput.qml → KeePit/qml/PasswordInput.qml
diff --git a/KeePit/Selector.qml → KeePit/qml/Selector.qml b/KeePit/Selector.qml → KeePit/qml/Selector.qml
diff --git a/clickable.json b/clickable.json
@@ -1,5 +1,5 @@
 {
-    	"template": "qmake",
+	"template": "qmake",
 	"sdk":"ubuntu-sdk-16.04",
 	"arch":"armhf",
 	"app":"keepit.dannygb"