Merge pull request #4

ef66f9b Wizard: bugfix for "next" button on password page (Ilya Kitaev)
cb45a37 Language files added to resources (Ilya Kitaev)

4 files changed, 16 insertions, 11 deletions

diff --git a/monero-core.pro b/monero-core.pro
index f2e24e46..75812a7e 100644
--- a/monero-core.pro
+++ b/monero-core.pro
@@ -28,7 +28,3 @@ QML_IMPORT_PATH =
 # Default rules for deployment.
 include(deployment.pri)
 
-# copy language files (xml and images) to the output directory
-copydata.commands = $(COPY_DIR) $$shell_path($$PWD/lang) $$shell_path($$DESTDIR/lang)
-QMAKE_EXTRA_TARGETS += copydata
-POST_TARGETDEPS += copydata
diff --git a/qml.qrc b/qml.qrc
index aeedc37a..e2e774af 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -96,5 +96,16 @@
         <file>wizard/WizardDonation.qml</file>
         <file>wizard/WizardFinish.qml</file>
         <file>wizard/WizardPasswordInput.qml</file>
+        <file>lang/languages.xml</file>
+        <file>lang/flags/bangladesh.png</file>
+        <file>lang/flags/brazil.png</file>
+        <file>lang/flags/china.png</file>
+        <file>lang/flags/german.png</file>
+        <file>lang/flags/india.png</file>
+        <file>lang/flags/palestine.png</file>
+        <file>lang/flags/rpa.png</file>
+        <file>lang/flags/russia.png</file>
+        <file>lang/flags/uk.png</file>
+        <file>lang/flags/usa.png</file>
     </qresource>
 </RCC>
diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml
index 905e0c5f..6cb26356 100644
--- a/wizard/WizardMain.qml
+++ b/wizard/WizardMain.qml
@@ -62,11 +62,9 @@ Rectangle {
 
         // disallow "next" button until passwords match
         if (pages[currentPage] === passwordPage) {
-            nextButton.visible = passwordPage.passwordValid
-        }
-
-        // display settings summary
-        if (pages[currentPage] === finishPage) {
+            nextButton.visible = passwordPage.passwordValid;
+        } else if (pages[currentPage] === finishPage) {
+            // display settings summary
             finishPage.updateSettingsSummary();
             nextButton.visible = false
         } else {
diff --git a/wizard/WizardWelcome.qml b/wizard/WizardWelcome.qml
index f627e88d..208a7994 100644
--- a/wizard/WizardWelcome.qml
+++ b/wizard/WizardWelcome.qml
@@ -75,7 +75,7 @@ Item {
 
     XmlListModel {
         id: languagesModel
-        source: "file:///" + applicationDirectory + "/lang/languages.xml"
+        source: "/lang/languages.xml"
         query: "/languages/language"
 
         XmlRole { name: "name"; query: "@name/string()" }
@@ -113,7 +113,7 @@ Item {
                 color: gridView.currentIndex === index ? "#DBDBDB" : "#FFFFFF"
                 Image {
                     anchors.centerIn: parent
-                    source: "file:///" + applicationDirectory + flag
+                    source: flag
                 }
             }