From 829346b99532eb37bd715a75d74514c0c409dd23 Mon Sep 17 00:00:00 2001 From: Mark Washeim Date: Wed, 16 Nov 2022 18:50:40 +0100 Subject: [PATCH] Added navigation elements and model for bookmarks. --- harbour-tooterb.pro.user | 2801 ++++++++++------------ qml/lib/API.js | 2 + qml/pages/MainPage.qml | 34 +- qml/pages/components/NavigationPanel.qml | 9 +- translations/harbour-tooterb-de.ts | 4 + translations/harbour-tooterb-el.ts | 4 + translations/harbour-tooterb-es.ts | 4 + translations/harbour-tooterb-fr.ts | 4 + translations/harbour-tooterb-it.ts | 4 + translations/harbour-tooterb-nl.ts | 4 + translations/harbour-tooterb-nl_BE.ts | 4 + translations/harbour-tooterb-oc.ts | 4 + translations/harbour-tooterb-pl.ts | 4 + translations/harbour-tooterb-ru.ts | 4 + translations/harbour-tooterb-sr.ts | 4 + translations/harbour-tooterb-sv.ts | 4 + translations/harbour-tooterb-zh_CN.ts | 4 + translations/harbour-tooterb.ts | 4 + 18 files changed, 1359 insertions(+), 1543 deletions(-) diff --git a/harbour-tooterb.pro.user b/harbour-tooterb.pro.user index 3519283..160f0bd 100644 --- a/harbour-tooterb.pro.user +++ b/harbour-tooterb.pro.user @@ -1,1532 +1,1269 @@ - - - - - - EnvironmentId - {1eb0406f-b7ad-49c3-808f-08b8e70e23f1} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - SailfishOS-3.2.1.20-i486 (in Sailfish OS Build Engine) - SailfishOS-3.2.1.20-i486 (in Sailfish OS Build Engine) - SailfishOS-3.2.1.20-i486 - 1 - 1 - 0 - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_2_1_20_i486_in_Sailfish_OS_Build_Engine-Debug - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_2_1_20_i486_in_Sailfish_OS_Build_Engine-Release - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_2_1_20_i486_in_Sailfish_OS_Build_Engine-Profile - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Prepare Target - - QmakeProjectManager.MerPrepareTargetStep - - - true - RPM - - QmakeProjectManager.MerRpmDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy As RPM Package - - QmakeProjectManager.MerRpmDeployConfiguration - - - - - true - RPM - - QmakeProjectManager.MerRpmBuildStep - - - true - RPM Validation - - QmakeProjectManager.MerRpmValidationStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Build RPM Package For Manual Deployment - - QmakeProjectManager.MerMb2RpmBuildConfiguration - - - - - true - Prepare Target - - QmakeProjectManager.MerPrepareTargetStep - - - true - Rsync - - QmakeProjectManager.MerRsyncDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy By Copying Binaries - - QmakeProjectManager.MerRSyncDeployConfiguration - - 3 - - - dwarf - - cpu-cycles - - - 250 - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - C:/Users/XPAM/Github/Github-App/harbour-tooter - false - -1 - 3 - - 1 - - - harbour-tooterb (on Sailfish OS Emulator 3.3.0.16) - QmakeProjectManager.MerRunConfiguration:C:/Users/XPAM/Github/Github-App/harbour-tooter/harbour-tooterb.pro - 1 - - false - - 3768 - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.Target.1 - - SailfishOS-3.3.0.16-armv7hl (in Sailfish OS Build Engine) - SailfishOS-3.3.0.16-armv7hl (in Sailfish OS Build Engine) - SailfishOS-3.3.0.16-armv7hl - 1 - 1 - 0 - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_armv7hl_in_Sailfish_OS_Build_Engine-Debug - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_armv7hl_in_Sailfish_OS_Build_Engine-Release - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_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 - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Prepare Target - - QmakeProjectManager.MerPrepareTargetStep - - - true - RPM - - QmakeProjectManager.MerRpmDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy As RPM Package - - QmakeProjectManager.MerRpmDeployConfiguration - - - - - true - RPM - - QmakeProjectManager.MerRpmBuildStep - - - true - RPM Validation - - QmakeProjectManager.MerRpmValidationStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Build RPM Package For Manual Deployment - - QmakeProjectManager.MerMb2RpmBuildConfiguration - - - - - true - Prepare Target - - QmakeProjectManager.MerPrepareTargetStep - - - true - Rsync - - QmakeProjectManager.MerRsyncDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy By Copying Binaries - - QmakeProjectManager.MerRSyncDeployConfiguration - - 3 - - - dwarf - - cpu-cycles - - - 250 - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - C:/Users/XPAM/Github/Github-App/harbour-tooter - false - -1 - 3 - - 1 - - - harbour-tooterb (on Sailfish OS Emulator 3.3.0.16) - QmakeProjectManager.MerRunConfiguration:C:/Users/XPAM/Github/Github-App/harbour-tooter/harbour-tooterb.pro - 1 - - false - - 3768 - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.Target.2 - - SailfishOS-3.3.0.16-i486 (in Sailfish OS Build Engine) - SailfishOS-3.3.0.16-i486 (in Sailfish OS Build Engine) - SailfishOS-3.3.0.16-i486 - 1 - 2 - 0 - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_i486_in_Sailfish_OS_Build_Engine-Debug - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_i486_in_Sailfish_OS_Build_Engine-Release - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_3_0_16_i486_in_Sailfish_OS_Build_Engine-Profile - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Prepare Target - - QmakeProjectManager.MerPrepareTargetStep - - - true - RPM - - QmakeProjectManager.MerRpmDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy As RPM Package - - QmakeProjectManager.MerRpmDeployConfiguration - - - - - true - RPM - - QmakeProjectManager.MerRpmBuildStep - - - true - RPM Validation - - QmakeProjectManager.MerRpmValidationStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Build RPM Package For Manual Deployment - - QmakeProjectManager.MerMb2RpmBuildConfiguration - - - - - true - Prepare Target - - QmakeProjectManager.MerPrepareTargetStep - - - true - Rsync - - QmakeProjectManager.MerRsyncDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy By Copying Binaries - - QmakeProjectManager.MerRSyncDeployConfiguration - - 3 - - - dwarf - - cpu-cycles - - - 250 - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - C:/Users/XPAM/Github/Github-App/harbour-tooter - false - -1 - 3 - - 1 - - - harbour-tooterb (on Sailfish OS Emulator 3.3.0.16) - QmakeProjectManager.MerRunConfiguration:C:/Users/XPAM/Github/Github-App/harbour-tooter/harbour-tooterb.pro - 1 - - false - - 3768 - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.Target.3 - - SailfishOS-3.2.1.20-armv7hl (in Sailfish OS Build Engine) - SailfishOS-3.2.1.20-armv7hl (in Sailfish OS Build Engine) - SailfishOS-3.2.1.20-armv7hl - 1 - 1 - 0 - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_2_1_20_armv7hl_in_Sailfish_OS_Build_Engine-Debug - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_2_1_20_armv7hl_in_Sailfish_OS_Build_Engine-Release - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_3_2_1_20_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 - - false - - - false - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Start Build Engine - - Mer.MerSdkStartStep - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 2 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Prepare Target - - QmakeProjectManager.MerPrepareTargetStep - - - true - RPM - - QmakeProjectManager.MerRpmDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy As RPM Package - - QmakeProjectManager.MerRpmDeployConfiguration - - - - - true - RPM - - QmakeProjectManager.MerRpmBuildStep - - - true - RPM Validation - - QmakeProjectManager.MerRpmValidationStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Build RPM Package For Manual Deployment - - QmakeProjectManager.MerMb2RpmBuildConfiguration - - - - - true - Prepare Target - - QmakeProjectManager.MerPrepareTargetStep - - - true - Rsync - - QmakeProjectManager.MerRsyncDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy By Copying Binaries - - QmakeProjectManager.MerRSyncDeployConfiguration - - 3 - - - dwarf - - cpu-cycles - - - 250 - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - C:/Users/XPAM/Github/Github-App/harbour-tooter - false - -1 - 3 - - 1 - - - harbour-tooterb (on Sailfish OS Emulator 3.3.0.16) - QmakeProjectManager.MerRunConfiguration:C:/Users/XPAM/Github/Github-App/harbour-tooter/harbour-tooterb.pro - 1 - - false - - 3768 - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.TargetCount - 4 - - - ProjectExplorer.Project.Updater.FileVersion - 21 - - - Version - 21 - - + + + + + + EnvironmentId + {ddbad1fa-3e15-4c49-99dc-7ab87bce53d2} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + false + true + false + 0 + true + true + 0 + 8 + true + false + 1 + true + true + true + *.md, *.MD, Makefile + false + true + + + + ProjectExplorer.Project.PluginSettings + + + true + false + true + true + true + true + + + 0 + true + + true + Builtin.BuildSystem + + true + true + Builtin.DefaultTidyAndClazy + 4 + + + + true + + + + + ProjectExplorer.Project.Target.0 + + Mer.Device.Type + SailfishOS-4.4.0.58-aarch64 (in Sailfish SDK Build Engine) + SailfishOS-4.4.0.58-aarch64 (in Sailfish SDK Build Engine) + SailfishOS-4.4.0.58-aarch64.default + 0 + 0 + 0 + + 0 + false + + + + + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Debug + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Debug + + + true + Mer.MerSdkStartStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 3 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Mer.MerSdkStartStep + + + reset + true + Mer.MerClearBuildEnvironmentStep + + + true + Qt4ProjectManager.MakeStep + clean + + 3 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 1 + + + false + + + + + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Release + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Release + + + true + Mer.MerSdkStartStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 3 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Mer.MerSdkStartStep + + + reset + true + Mer.MerClearBuildEnvironmentStep + + + true + Qt4ProjectManager.MakeStep + clean + + 3 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 1 + + + 0 + false + + + + + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Profile + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Profile + + + true + Mer.MerSdkStartStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 3 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Mer.MerSdkStartStep + + + reset + true + Mer.MerClearBuildEnvironmentStep + + + true + Qt4ProjectManager.MakeStep + clean + + 3 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 1 + 0 + + 3 + + + + true + QmakeProjectManager.MerPrepareTargetStep + + + true + QmakeProjectManager.MerRpmBuildStep + + + --sdk + true + QmakeProjectManager.MerRpmDeployStep + + 3 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + QmakeProjectManager.MerRpmDeployConfiguration + + + + + true + QmakeProjectManager.MerRpmBuildStep + + + true + QmakeProjectManager.MerRpmValidationStep + + 2 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + QmakeProjectManager.MerMb2RpmBuildConfiguration + + + + + true + QmakeProjectManager.MerPrepareTargetStep + + + true + QmakeProjectManager.MerMakeInstallBuildStep + + + --rsync + true + QmakeProjectManager.MerRsyncDeployStep + + 3 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + QmakeProjectManager.MerRSyncDeployConfiguration + + 3 + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + + 25 + + 1 + true + false + true + + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + true + /home/mwa/src/sailfish/harbour-tooter + true + -1 + 3 + + 1 + + harbour-tooterb (on %{Device:Name}) + QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro + /home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro + 1 + false + true + false + true + :0.0 + + 1 + + + + ProjectExplorer.Project.Target.1 + + Mer.Device.Type + SailfishOS-4.4.0.58-armv7hl (in Sailfish SDK Build Engine) + SailfishOS-4.4.0.58-armv7hl (in Sailfish SDK Build Engine) + SailfishOS-4.4.0.58-armv7hl.default + 0 + 0 + 0 + + 0 + false + + + + + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Debug + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Debug + + + true + Mer.MerSdkStartStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 3 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Mer.MerSdkStartStep + + + reset + true + Mer.MerClearBuildEnvironmentStep + + + true + Qt4ProjectManager.MakeStep + clean + + 3 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 1 + + + false + + + + + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Release + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Release + + + true + Mer.MerSdkStartStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 3 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Mer.MerSdkStartStep + + + reset + true + Mer.MerClearBuildEnvironmentStep + + + true + Qt4ProjectManager.MakeStep + clean + + 3 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 1 + + + 0 + false + + + + + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Profile + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Profile + + + true + Mer.MerSdkStartStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 3 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Mer.MerSdkStartStep + + + reset + true + Mer.MerClearBuildEnvironmentStep + + + true + Qt4ProjectManager.MakeStep + clean + + 3 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 1 + 0 + + 3 + + + + true + QmakeProjectManager.MerPrepareTargetStep + + + true + QmakeProjectManager.MerRpmBuildStep + + + --sdk + true + QmakeProjectManager.MerRpmDeployStep + + 3 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + QmakeProjectManager.MerRpmDeployConfiguration + + + + + true + QmakeProjectManager.MerRpmBuildStep + + + true + QmakeProjectManager.MerRpmValidationStep + + 2 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + QmakeProjectManager.MerMb2RpmBuildConfiguration + + + + + true + QmakeProjectManager.MerPrepareTargetStep + + + true + QmakeProjectManager.MerMakeInstallBuildStep + + + --rsync + true + QmakeProjectManager.MerRsyncDeployStep + + 3 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + QmakeProjectManager.MerRSyncDeployConfiguration + + 3 + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + + 25 + + 1 + true + false + true + + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + true + /home/mwa/src/sailfish/harbour-tooter + false + -1 + 3 + + 1 + + harbour-tooterb (on %{Device:Name}) + QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro + /home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro + 1 + false + true + false + true + :0.0 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + + 25 + + 1 + true + false + true + + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + true + /home/mwa/src/sailfish/harbour-tooter + false + -1 + 3 + + 1 + + harbour-tooterb + QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro + /home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro + 1 + false + true + false + true + :0.0 + + 2 + + + + ProjectExplorer.Project.Target.2 + + Mer.Device.Type + SailfishOS-4.4.0.58-i486 (in Sailfish SDK Build Engine) + SailfishOS-4.4.0.58-i486 (in Sailfish SDK Build Engine) + SailfishOS-4.4.0.58-i486.default + 0 + 0 + 0 + + 0 + false + + + + + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Debug + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Debug + + + true + Mer.MerSdkStartStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 3 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Mer.MerSdkStartStep + + + reset + true + Mer.MerClearBuildEnvironmentStep + + + true + Qt4ProjectManager.MakeStep + clean + + 3 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 1 + + + false + + + + + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Release + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Release + + + true + Mer.MerSdkStartStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 3 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Mer.MerSdkStartStep + + + reset + true + Mer.MerClearBuildEnvironmentStep + + + true + Qt4ProjectManager.MakeStep + clean + + 3 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 1 + + + 0 + false + + + + + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Profile + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Profile + + + true + Mer.MerSdkStartStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 3 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Mer.MerSdkStartStep + + + reset + true + Mer.MerClearBuildEnvironmentStep + + + true + Qt4ProjectManager.MakeStep + clean + + 3 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 1 + 0 + + 3 + + + + true + QmakeProjectManager.MerPrepareTargetStep + + + true + QmakeProjectManager.MerRpmBuildStep + + + --sdk + true + QmakeProjectManager.MerRpmDeployStep + + 3 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + QmakeProjectManager.MerRpmDeployConfiguration + + + + + true + QmakeProjectManager.MerRpmBuildStep + + 1 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + QmakeProjectManager.MerMb2RpmBuildConfiguration + + + + + true + QmakeProjectManager.MerPrepareTargetStep + + + true + QmakeProjectManager.MerMakeInstallBuildStep + + + --rsync + true + QmakeProjectManager.MerRsyncDeployStep + + 3 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + QmakeProjectManager.MerRSyncDeployConfiguration + + 3 + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + + 25 + + 1 + true + false + true + + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + true + /home/mwa/src/sailfish/harbour-tooter + false + -1 + 3 + + 2 + + ProjectExplorer.CustomExecutableRunConfiguration + + false + true + false + true + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + + 25 + + 1 + true + false + true + + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + true + /home/mwa/src/sailfish/harbour-tooter + false + -1 + 3 + + 1 + + QmakeProjectManager.MerCustomRunConfiguration: + + 1 + false + true + false + true + :0.0 + + 2 + + + + ProjectExplorer.Project.TargetCount + 3 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/qml/lib/API.js b/qml/lib/API.js index cfc6fa8..f2a4a40 100644 --- a/qml/lib/API.js +++ b/qml/lib/API.js @@ -116,6 +116,8 @@ var modelTLpublic = Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt var modelTLlocal = Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject'); var modelTLnotifications = Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject'); var modelTLsearch = Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject'); +var modelTLbookmarks = Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject'); + var notificationsList = [] var notificationGenerator = function(item){ diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index 0ce3be1..5f62890 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -6,7 +6,7 @@ import "./components/" Page { id: mainPage - + property bool debug: false property bool isFirstPage: true property bool isTablet: true //Screen.sizeCategory >= Screen.Large @@ -24,7 +24,8 @@ Page { id: navigation isPortrait: !mainPage.isPortrait onSlideshowShow: { - console.log(vIndex) + if (debug) console.log(vIndex) + slideshow.positionViewAtIndex(vIndex, ListView.SnapToItem) } } @@ -74,6 +75,15 @@ Page { height: parent.itemHeight onOpenDrawer: isPortrait ? infoPanel.open = setDrawer : infoPanel.open = true } + MyList { + id: tlBookmarks + title: qsTr("Bookmarks") + type: "bookmarks" + mdl: Logic.modelTLbookmarks + width: isPortrait ? parent.itemWidth : parent.itemWidth - Theme.itemSizeLarge + height: parent.itemHeight + onOpenDrawer: isPortrait ? infoPanel.open = setDrawer : infoPanel.open = true + } Item { id: tlSearch @@ -84,7 +94,7 @@ Page { width: isPortrait ? parent.itemWidth : parent.itemWidth - Theme.itemSizeLarge height: parent.itemHeight onSearchChanged: { - console.log(search) + if (debug) console.log(search) loader.sourceComponent = loading if (search.charAt(0) === "@") { loader.sourceComponent = userListComponent @@ -114,7 +124,7 @@ Page { EnterKey.onClicked: { tlSearch.search = text.toLowerCase().trim() focus = false - console.log(text) + if (debug) console.log(text) } } } @@ -270,17 +280,21 @@ Page { function onLinkActivated(href) { var test = href.split("/") - console.log(href) - console.log(JSON.stringify(test)) - console.log(JSON.stringify(test.length)) + debug = true + if (debug) { + console.log(href) + console.log(JSON.stringify(test)) + console.log(JSON.stringify(test.length)) + } if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) { tlSearch.search = "#"+decodeURIComponent(test[4]) - slideshow.positionViewAtIndex(4, ListView.SnapToItem) + slideshow.positionViewAtIndex(5, ListView.SnapToItem) navigation.navigateTo('search') + console.log("search tag") } else if (test.length === 4 && test[3][0] === "@" ) { tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2]) - slideshow.positionViewAtIndex(4, ListView.SnapToItem) + slideshow.positionViewAtIndex(5, ListView.SnapToItem) navigation.navigateTo('search') } else { @@ -289,6 +303,6 @@ Page { } Component.onCompleted: { - console.log("aaa") + //console.log("aaa") } } diff --git a/qml/pages/components/NavigationPanel.qml b/qml/pages/components/NavigationPanel.qml index 9846baa..ffeefa0 100644 --- a/qml/pages/components/NavigationPanel.qml +++ b/qml/pages/components/NavigationPanel.qml @@ -38,7 +38,6 @@ SilicaGridView { active: false unread: false } - ListElement { icon: "image://theme/icon-m-website?" slug: "federated" @@ -47,6 +46,14 @@ SilicaGridView { unread: false } + ListElement { + icon: "../../images/icon-s-bookmark.svg?" + //icon: "image://theme/icon-s-bookmark" + slug: "bookmarks" + name: "Bookmarks" + active: false + unread: false + } ListElement { icon: "image://theme/icon-m-search?" slug: "search" diff --git a/translations/harbour-tooterb-de.ts b/translations/harbour-tooterb-de.ts index ebe1c3c..b7a94df 100644 --- a/translations/harbour-tooterb-de.ts +++ b/translations/harbour-tooterb-de.ts @@ -149,6 +149,10 @@ New Toot Neuer Toot + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-el.ts b/translations/harbour-tooterb-el.ts index a4a7b3b..96d86eb 100644 --- a/translations/harbour-tooterb-el.ts +++ b/translations/harbour-tooterb-el.ts @@ -149,6 +149,10 @@ New Toot Νέος + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-es.ts b/translations/harbour-tooterb-es.ts index 6641309..27a8eeb 100644 --- a/translations/harbour-tooterb-es.ts +++ b/translations/harbour-tooterb-es.ts @@ -149,6 +149,10 @@ New Toot Nuevo toot + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-fr.ts b/translations/harbour-tooterb-fr.ts index 5657178..756d453 100644 --- a/translations/harbour-tooterb-fr.ts +++ b/translations/harbour-tooterb-fr.ts @@ -149,6 +149,10 @@ New Toot Nouveau pouet + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-it.ts b/translations/harbour-tooterb-it.ts index 9b7dfe8..89715d2 100644 --- a/translations/harbour-tooterb-it.ts +++ b/translations/harbour-tooterb-it.ts @@ -149,6 +149,10 @@ New Toot Nuovo Toot + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-nl.ts b/translations/harbour-tooterb-nl.ts index e0bf1d1..cb88aeb 100644 --- a/translations/harbour-tooterb-nl.ts +++ b/translations/harbour-tooterb-nl.ts @@ -149,6 +149,10 @@ New Toot Nieuwe Toot + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-nl_BE.ts b/translations/harbour-tooterb-nl_BE.ts index 0089850..117be0f 100644 --- a/translations/harbour-tooterb-nl_BE.ts +++ b/translations/harbour-tooterb-nl_BE.ts @@ -149,6 +149,10 @@ New Toot Nieuwen toot + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-oc.ts b/translations/harbour-tooterb-oc.ts index 81fb159..12881ac 100644 --- a/translations/harbour-tooterb-oc.ts +++ b/translations/harbour-tooterb-oc.ts @@ -149,6 +149,10 @@ New Toot Nòu Tut + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-pl.ts b/translations/harbour-tooterb-pl.ts index 8c1140c..b5a30e3 100644 --- a/translations/harbour-tooterb-pl.ts +++ b/translations/harbour-tooterb-pl.ts @@ -149,6 +149,10 @@ New Toot Nowy wpis + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-ru.ts b/translations/harbour-tooterb-ru.ts index 98a54ca..3bc83f8 100644 --- a/translations/harbour-tooterb-ru.ts +++ b/translations/harbour-tooterb-ru.ts @@ -149,6 +149,10 @@ New Toot Новый + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-sr.ts b/translations/harbour-tooterb-sr.ts index 11298c2..164a2f4 100644 --- a/translations/harbour-tooterb-sr.ts +++ b/translations/harbour-tooterb-sr.ts @@ -149,6 +149,10 @@ New Toot Novi toot + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-sv.ts b/translations/harbour-tooterb-sv.ts index 53b7f6e..adcb45f 100644 --- a/translations/harbour-tooterb-sv.ts +++ b/translations/harbour-tooterb-sv.ts @@ -149,6 +149,10 @@ New Toot Ny toot + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb-zh_CN.ts b/translations/harbour-tooterb-zh_CN.ts index 050c9fc..d5a9094 100644 --- a/translations/harbour-tooterb-zh_CN.ts +++ b/translations/harbour-tooterb-zh_CN.ts @@ -149,6 +149,10 @@ New Toot 新嘟嘟 + + Bookmarks + + MediaFullScreen diff --git a/translations/harbour-tooterb.ts b/translations/harbour-tooterb.ts index 49f0835..fa78494 100644 --- a/translations/harbour-tooterb.ts +++ b/translations/harbour-tooterb.ts @@ -149,6 +149,10 @@ New Toot New Toot + + Bookmarks + + MediaFullScreen