aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Kitaev <mbg033@gmail.com>2016-01-27 22:06:38 +0300
committerIlya Kitaev <mbg033@gmail.com>2016-01-27 22:06:38 +0300
commitcb45a37c9534ba18fbc7ede2439d81dfbe601210 (patch)
treefeac20905a66c934b042dec333e72b4647d55ff9
parent3cfa176605e916c918ec6e270e44f6a8e8ca1d34 (diff)
downloadmonzero-gui-cb45a37c9534ba18fbc7ede2439d81dfbe601210.tar.gz
monzero-gui-cb45a37c9534ba18fbc7ede2439d81dfbe601210.tar.xz
monzero-gui-cb45a37c9534ba18fbc7ede2439d81dfbe601210.zip
Language files added to resources
-rw-r--r--monero-core.pro4
-rw-r--r--qml.qrc11
-rw-r--r--wizard/WizardWelcome.qml4
3 files changed, 13 insertions, 6 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/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
}
}