From 35cbd7527d557cb980e9a3d870dcdc9c4c8bdb0f Mon Sep 17 00:00:00 2001 From: Maximilian Stiefel Date: Sun, 3 Mar 2019 12:16:45 +0100 Subject: [PATCH] DENL support. --- dictcc | 2 +- harbour-wordbook.pro.user | 531 ++++++++++++++++++++++++++++++++++---- qml/pages/FirstPage.qml | 8 +- src/dict_model.h | 2 +- 4 files changed, 492 insertions(+), 51 deletions(-) diff --git a/dictcc b/dictcc index 78d4508..69efe5b 160000 --- a/dictcc +++ b/dictcc @@ -1 +1 @@ -Subproject commit 78d450818192bf700f20422427aca3a81a78bf92 +Subproject commit 69efe5b7aef86c9427793ebae2833e58c456d25b diff --git a/harbour-wordbook.pro.user b/harbour-wordbook.pro.user index 1b42f85..4c82f72 100644 --- a/harbour-wordbook.pro.user +++ b/harbour-wordbook.pro.user @@ -1,14 +1,14 @@ - + EnvironmentId - {80bcf696-971a-458e-b870-5250a3256889} + {cb70de9d-12f2-402d-9e86-68fee36e0c3e} ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -59,14 +59,14 @@ ProjectExplorer.Project.Target.0 - Desktop - Desktop - {a1ccde5b-c399-4de9-847c-fecf9ec99eb2} + SailfishOS-3.0.1.11-armv7hl (in Sailfish OS Build Engine) + SailfishOS-3.0.1.11-armv7hl (in Sailfish OS Build Engine) + {ae302a46-cd96-452d-becc-efcc08884d5b} 0 - 0 + 2 0 - /home/maximilian/build-harbour-wordbook-Desktop-Debug + /home/maximilian/git/build-harbour-wordbook-SailfishOS_3_0_1_11_armv7hl_in_Sailfish_OS_Build_Engine-Debug true @@ -79,7 +79,7 @@ qmake QtProjectManager.QMakeBuildStep - false + true false false @@ -132,13 +132,13 @@ false Debug - + Debug Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/maximilian/build-harbour-wordbook-Desktop-Release + /home/maximilian/git/build-harbour-wordbook-SailfishOS_3_0_1_11_armv7hl_in_Sailfish_OS_Build_Engine-Release true @@ -204,25 +204,157 @@ false Release - + Release Qt4ProjectManager.Qt4BuildConfiguration 0 true - 2 + + /home/maximilian/git/build-harbour-wordbook-SailfishOS_3_0_1_11_armv7hl_in_Sailfish_OS_Build_Engine-Profile + + + true + Start Build Engine + + Mer.MerSdkStartStep + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 3 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Start Build Engine + + Mer.MerSdkStartStep + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 2 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 - 0 + + true + RPM + + QmakeProjectManager.MerRpmBuildStep + + + true + RPM Validation + + QmakeProjectManager.MerRpmValidationStep + + 2 Deploy ProjectExplorer.BuildSteps.Deploy 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration + Build RPM Package For Manual Deployment + Build RPM Package For Manual Deployment + QmakeProjectManager.MerMb2RpmBuildConfiguration - 1 + + + + true + Prepare Target + + QmakeProjectManager.MerPrepareTargetStep + + + true + Rsync + + QmakeProjectManager.MerRsyncDeployStep + + 2 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy By Copying Binaries + Deploy By Copying Binaries + QmakeProjectManager.MerRSyncDeployConfiguration + + + + + true + Prepare Target + + QmakeProjectManager.MerPrepareTargetStep + + + true + RPM + + QmakeProjectManager.MerRpmDeployStep + + 2 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy As RPM Package + Deploy As RPM Package + QmakeProjectManager.MerRpmDeployConfiguration + + 3 false @@ -264,22 +396,22 @@ 13 14 - /home/maximilian/harbour-wordbook + /home/maximilian/git/harbour-wordbook false 10234 3 - 2 + 1 - harbour-wordbook + harbour-wordbook (on Sailfish OS Emulator) - Qt4ProjectManager.Qt4RunConfiguration:/home/maximilian/harbour-wordbook/harbour-wordbook.pro - true - - harbour-wordbook.pro - false - - /home/maximilian/build-harbour-wordbook-SailfishOS_2_1_4_13_armv7hl_in_Sailfish_OS_Build_Engine-Debug + QmakeProjectManager.MerRunConfiguration:/home/maximilian/git/harbour-wordbook/harbour-wordbook.pro + + 1 + + false + + 3768 false true @@ -293,14 +425,14 @@ ProjectExplorer.Project.Target.1 - SailfishOS-2.1.4.13-armv7hl (in Sailfish OS Build Engine) - SailfishOS-2.1.4.13-armv7hl (in Sailfish OS Build Engine) - {78ef6d63-a499-4e0c-a2c9-319195055963} + SailfishOS-3.0.1.11-i486 (in Sailfish OS Build Engine) + SailfishOS-3.0.1.11-i486 (in Sailfish OS Build Engine) + {f802cf27-a4c0-4b7b-8f07-10172e088802} 0 - 2 + 0 0 - /home/maximilian/build-harbour-wordbook-SailfishOS_2_1_4_13_armv7hl_in_Sailfish_OS_Build_Engine-Debug + /home/maximilian/git/build-harbour-wordbook-SailfishOS_3_0_1_11_i486_in_Sailfish_OS_Build_Engine-Debug true @@ -366,13 +498,13 @@ false Debug - + Debug Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/maximilian/build-harbour-wordbook-SailfishOS_2_1_4_13_armv7hl_in_Sailfish_OS_Build_Engine-Release + /home/maximilian/git/build-harbour-wordbook-SailfishOS_3_0_1_11_i486_in_Sailfish_OS_Build_Engine-Release true @@ -438,13 +570,13 @@ false Release - + Release Qt4ProjectManager.Qt4BuildConfiguration 0 true - /home/maximilian/build-harbour-wordbook-SailfishOS_2_1_4_13_armv7hl_in_Sailfish_OS_Build_Engine-Profile + /home/maximilian/git/build-harbour-wordbook-SailfishOS_3_0_1_11_i486_in_Sailfish_OS_Build_Engine-Profile true @@ -510,7 +642,7 @@ false Profile - + Profile Qt4ProjectManager.Qt4BuildConfiguration 0 true @@ -536,8 +668,8 @@ ProjectExplorer.BuildSteps.Deploy 1 - Deploy By Building An RPM Package - + Build RPM Package For Manual Deployment + Build RPM Package For Manual Deployment QmakeProjectManager.MerMb2RpmBuildConfiguration @@ -561,7 +693,7 @@ 1 Deploy By Copying Binaries - + Deploy By Copying Binaries QmakeProjectManager.MerRSyncDeployConfiguration @@ -585,7 +717,7 @@ 1 Deploy As RPM Package - + Deploy As RPM Package QmakeProjectManager.MerRpmDeployConfiguration 3 @@ -630,22 +762,327 @@ 13 14 - /home/maximilian/harbour-wordbook + /home/maximilian/git/harbour-wordbook false 10234 3 1 - harbour-wordbook (on Remote Device) + harbour-wordbook (on Sailfish OS Emulator) - QmakeProjectManager.MerRunConfiguration:harbour-wordbook + QmakeProjectManager.MerRunConfiguration:/home/maximilian/git/harbour-wordbook/harbour-wordbook.pro - harbour-wordbook 1 false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop + Desktop + {56d6597c-8f49-4db9-9ead-9a0f873876c0} + 0 + 0 + 0 + + /home/maximilian/git/build-harbour-wordbook-Desktop-Debug + + + true + Start Build Engine + + Mer.MerSdkStartStep + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 3 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Start Build Engine + + Mer.MerSdkStartStep + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 2 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/maximilian/git/build-harbour-wordbook-Desktop-Release + + + true + Start Build Engine + + Mer.MerSdkStartStep + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 3 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Start Build Engine + + Mer.MerSdkStartStep + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 2 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/maximilian/git/build-harbour-wordbook-Desktop-Profile + + + true + Start Build Engine + + Mer.MerSdkStartStep + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 3 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Start Build Engine + + Mer.MerSdkStartStep + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 2 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + /home/maximilian/git/harbour-wordbook + false + 10234 + 3 + + 2 + + harbour-wordbook + + Qt4ProjectManager.Qt4RunConfiguration:/home/maximilian/git/harbour-wordbook/harbour-wordbook.pro + true + + harbour-wordbook.pro + + 3768 false true @@ -658,7 +1095,7 @@ ProjectExplorer.Project.TargetCount - 2 + 3 ProjectExplorer.Project.Updater.FileVersion diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml index b17b905..2a1c5bc 100644 --- a/qml/pages/FirstPage.qml +++ b/qml/pages/FirstPage.qml @@ -18,11 +18,15 @@ Page { PullDownMenu { MenuItem { text: "DEEN" - onClicked: pageStack.push(Qt.resolvedUrl("About.qml")) + onClicked: dict_model.change_language("DEEN") } MenuItem { text: "DESV" - onClicked: pageStack.push(Qt.resolvedUrl("About.qml")) + onClicked: dict_model.change_language("DESV") + } + MenuItem { + text: "DENL" + onClicked: dict_model.change_language("DENL") } MenuItem { text: "About" diff --git a/src/dict_model.h b/src/dict_model.h index 00a15e9..b75c00d 100644 --- a/src/dict_model.h +++ b/src/dict_model.h @@ -32,7 +32,7 @@ #define DICTMODEL_H #include -#include "../dict/dict.h" +#include "../dictcc/dict.h" class DictModel : public QAbstractListModel {