4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-14 12:26:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4

Browse Source 
ef66f9b Wizard: bugfix for "next" button on password page (Ilya Kitaev)
cb45a37 Language files added to resources (Ilya Kitaev)
This commit is contained in:
Riccardo Spagni 2016-01-28 11:24:11 +02:00
commit 0429aac7ad
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monero-core.pro
View File

@ -28,7 +28,3 @@ QML_IMPORT_PATH =
# Default rules for deployment. # Default rules for deployment.
include(deployment.pri) 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

11
qml.qrc
View File

@ -96,5 +96,16 @@
<file>wizard/WizardDonation.qml</file> <file>wizard/WizardDonation.qml</file>
<file>wizard/WizardFinish.qml</file> <file>wizard/WizardFinish.qml</file>
<file>wizard/WizardPasswordInput.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> </qresource>
</RCC> </RCC>

6
wizard/WizardMain.qml
View File

@ -62,11 +62,9 @@ Rectangle {
// disallow "next" button until passwords match // disallow "next" button until passwords match
if (pages[currentPage] === passwordPage) { if (pages[currentPage] === passwordPage) {
nextButton.visible = passwordPage.passwordValid nextButton.visible = passwordPage.passwordValid;
} } else if (pages[currentPage] === finishPage) {
// display settings summary // display settings summary
if (pages[currentPage] === finishPage) {
finishPage.updateSettingsSummary(); finishPage.updateSettingsSummary();
nextButton.visible = false nextButton.visible = false
} else { } else {

4
wizard/WizardWelcome.qml
View File

@ -75,7 +75,7 @@ Item {
XmlListModel { XmlListModel {
id: languagesModel id: languagesModel
source: "file:///" + applicationDirectory + "/lang/languages.xml" source: "/lang/languages.xml"
query: "/languages/language" query: "/languages/language"
XmlRole { name: "name"; query: "@name/string()" } XmlRole { name: "name"; query: "@name/string()" }
@ -113,7 +113,7 @@ Item {
color: gridView.currentIndex === index ? "#DBDBDB" : "#FFFFFF" color: gridView.currentIndex === index ? "#DBDBDB" : "#FFFFFF"
Image { Image {
anchors.centerIn: parent anchors.centerIn: parent
source: "file:///" + applicationDirectory + flag source: flag
} }
} }