From 94368782e186b31f270f79175a6ce47d347516be Mon Sep 17 00:00:00 2001
From: kirbylife <kirbylife@protonmail.com>
Date: Wed, 20 Mar 2024 00:55:48 -0600
Subject: [PATCH 1/4] Change the deprecated SilicaWebView to the new WebView
---
qml/pages/ArticlePage.qml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/qml/pages/ArticlePage.qml b/qml/pages/ArticlePage.qml
index cb6d2d8..413e9d2 100644
--- a/qml/pages/ArticlePage.qml
+++ b/qml/pages/ArticlePage.qml
@@ -21,6 +21,9 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
+import Sailfish.WebView 1.0
+import Sailfish.WebEngine 1.0
+import Sailfish.WebView.Popups 1.0
Page {
id: articlePage
@@ -29,7 +32,7 @@ Page {
property string title
property string content
- SilicaWebView {
+ WebView {
id: webview
anchors.fill: parent
@@ -42,9 +45,13 @@ Page {
var html =
"<html>" +
"<head>" +
+ "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">" +
"<style type=\"text/css\">" +
"article { font-family: sans-serif; font-size: 16px; }" +
- "article h1 { font-size: 32px; }" +
+ "article h1 { font-size: 25px; }" +
+ "img { max-width: 100%; height: auto; }" +
+ "pre { word-wrap: normal; overflow-x: auto }" +
+ "code { word-wrap: normal; overflow-x: auto }" +
"</style>" +
"</head>" +
"<body>" +
From bec51bed4caaa9474993a52f69681f7a5755b2c0 Mon Sep 17 00:00:00 2001
From: kirbylife <kirbylife@protonmail.com>
Date: Tue, 26 Mar 2024 00:00:55 -0600
Subject: [PATCH 2/4] Add output compilation folder
---
.gitignore | 2 ++
README.md | 19 +++++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 README.md
diff --git a/.gitignore b/.gitignore
index 75c107b..c05ac65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
*.pro.user
+
+output/
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..01a7b47
--- /dev/null
+++ b/README.md
@@ -0,0 +1,19 @@
+# Wallaread - SailfishOS client for Wallabag 2+
+
+This project is a fork of the original [goestreicher repository](https://github.com/goestreicher/harbour-wallaread). In this repository is the continuation of that project .
+
+Wallaread is a client to SailfishOS for [Wallabag](https://www.wallabag.it/en), a self-hosted service that allows you to save a copy of your favorite articles to read later.
+
+## Installation
+
+The pre-compiled package is available through [OpenRepos](https://openrepos.net/content/kirbylife/wallabag).
+You can install it by directly downloading the .rpm file for your architecture or through Storeman.
+
+
+## Compilation
+
+The recomended option to compile this project
+
+```Bash
+docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$OS_VERSION /bin/bash -c " mkdir -p build ; cd build ; cp -r /share/* . ; mb2 -t SailfishOS-4.5.0.16-aarch64 build ; sudo cp -r RPMS/*.rpm /share/output"
+```
From 2775086ca3c5b6310aa7a7a5f22ee86d0a1be297 Mon Sep 17 00:00:00 2001
From: kirbylife <kirbylife@protonmail.com>
Date: Tue, 26 Mar 2024 00:25:55 -0600
Subject: [PATCH 3/4] Add README file
---
README.md | 33 +++++++++++++++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 01a7b47..769333c 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,37 @@ You can install it by directly downloading the .rpm file for your architecture o
## Compilation
-The recomended option to compile this project
+The recomended option to compile this project is using Docker using the following command:
+aarch64
```Bash
-docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$OS_VERSION /bin/bash -c " mkdir -p build ; cd build ; cp -r /share/* . ; mb2 -t SailfishOS-4.5.0.16-aarch64 build ; sudo cp -r RPMS/*.rpm /share/output"
+docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:4.5.0.16 /bin/bash -c " mkdir -p build ; cd build ; cp -r /share/* . ; mb2 -t SailfishOS-4.5.0.16-aarch64 build ; sudo cp -r RPMS/*.rpm /share/output"
```
+
+armv7
+```Bash
+docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:4.5.0.16 /bin/bash -c " mkdir -p build ; cd build ; cp -r /share/* . ; mb2 -t SailfishOS-4.5.0.16-armv7hl build ; sudo cp -r RPMS/*.rpm /share/output"
+```
+
+i486
+```Bash
+docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:4.5.0.16 /bin/bash -c " mkdir -p build ; cd build ; cp -r /share/* . ; mb2 -t SailfishOS-4.5.0.16-i486 build ; sudo cp -r RPMS/*.rpm /share/output"
+```
+
+The .rpm package should be in the output/ directory.
+
+## Features
+
+- Login to multiple wallabag servers.
+- Synchronize aggregated items.
+- Read articles through a WebView.
+- Save articles locally so they can be read offline.
+
+## Translations
+
+You can help contribute to the translations of this project by creating files within the translations/ directory for the new language or by correcting existing translations.
+
+
+## Credits and license
+
+This project was originally created by [goestreicher](https://github.com/goestreicher) and he licensed it under GPL v3, so this license is preserved.
From dd3e3839ef614f96d5ab90eec2eaebe26d776f42 Mon Sep 17 00:00:00 2001
From: kirbylife <kirbylife@protonmail.com>
Date: Tue, 26 Mar 2024 00:55:51 -0600
Subject: [PATCH 4/4] Add spanish translation
---
CONTRIBUTORS.md | 1 +
translations/harbour-wallaread-es.ts | 251 +++++++++++++++++++++++++++
2 files changed, 252 insertions(+)
create mode 100644 translations/harbour-wallaread-es.ts
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 2c7bfd7..f96367b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,3 +1,4 @@
The following people have helped making WallaRead yet more awesome. Thanks to them!
* Quentin P.: French translation
+* kirbylife: New maintainer
diff --git a/translations/harbour-wallaread-es.ts b/translations/harbour-wallaread-es.ts
new file mode 100644
index 0000000..8ed7360
--- /dev/null
+++ b/translations/harbour-wallaread-es.ts
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+ <name>CoverPage</name>
+ <message>
+ <source>WallaRead</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ImageEmbedRequest</name>
+ <message>
+ <source>Failed to find the image source</source>
+ <translation>Error al extraer la imagen de la fuente original</translation>
+ </message>
+</context>
+<context>
+ <name>Server</name>
+ <message>
+ <source>Failed to load server information: </source>
+ <translation>Error al cargar la información del servidor: </translation>
+ </message>
+ <message>
+ <source>Failed to connect to server: </source>
+ <translation>Error al conectar con el servidor: </translation>
+ </message>
+ <message>
+ <source>Failed to download articles: </source>
+ <translation>Error al descargar los artículos: </translation>
+ </message>
+ <message>
+ <source>Failed to set star status on article: </source>
+ <translation>Error al marcar como favorito el artículo: </translation>
+ </message>
+ <message>
+ <source>Failed to set read status on article: </source>
+ <translation>Error al marcar como leído el artículo: </translation>
+ </message>
+ <message>
+ <source>Failed to delete article: </source>
+ <translation>Error al eliminar el artículo: </translation>
+ </message>
+ <message>
+ <source>Failed to upload article: </source>
+ <translation>Error al subir artículo: </translation>
+ </message>
+</context>
+<context>
+ <name>ServerPage</name>
+ <message>
+ <source>Article URL</source>
+ <translation>URL del artículo</translation>
+ </message>
+ <message>
+ <source>Refresh</source>
+ <translation>Recargar</translation>
+ </message>
+ <message>
+ <source>No articles saved on this server yet</source>
+ <translation>El servidor aún no tiene artículos guardados</translation>
+ </message>
+ <message>
+ <source>Deleting</source>
+ <translation>Eliminando</translation>
+ </message>
+ <message>
+ <source>Add article</source>
+ <translation>Agregar artículo</translation>
+ </message>
+ <message>
+ <source>Show: </source>
+ <translation>Mostrar: </translation>
+ </message>
+ <message>
+ <source>Sort: </source>
+ <translation>Ordenar: </translation>
+ </message>
+</context>
+<context>
+ <name>ServerPageShowDialog</name>
+ <message>
+ <source>Filter view</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <source>Read articles</source>
+ <translation>Artículos leídos</translation>
+ </message>
+ <message>
+ <source>Starred articles</source>
+ <translation>Artículos favoritos</translation>
+ </message>
+</context>
+<context>
+ <name>ServerPageShowPreferences</name>
+ <message>
+ <source>read</source>
+ <translation>Leído</translation>
+ </message>
+ <message>
+ <source>unread</source>
+ <translation>Por leer</translation>
+ </message>
+ <message>
+ <source>starred</source>
+ <translation>Favorito</translation>
+ </message>
+ <message>
+ <source>all</source>
+ <translation>Todos</translation>
+ </message>
+</context>
+<context>
+ <name>ServerPageSortDialog</name>
+ <message>
+ <source>Sort view</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <source>Sort order</source>
+ <translation>Criterio</translation>
+ </message>
+ <message>
+ <source>Sort Ascending</source>
+ <translation>Ordenar de manera ascendente</translation>
+ </message>
+</context>
+<context>
+ <name>ServerPageSortPreferences</name>
+ <message>
+ <source>Created</source>
+ <translation>Creado</translation>
+ </message>
+ <message>
+ <source>Updated</source>
+ <translation>Actualizado</translation>
+ </message>
+ <message>
+ <source>Domain</source>
+ <translation>Dominio</translation>
+ </message>
+</context>
+<context>
+ <name>ServerSettings</name>
+ <message>
+ <source>Failed to load server settings: </source>
+ <translation>Error al cargar la configuración del servidor: </translation>
+ </message>
+</context>
+<context>
+ <name>ServerSettingsDialog</name>
+ <message>
+ <source>Save</source>
+ <translation>Guardar</translation>
+ </message>
+ <message>
+ <source>Server Alias</source>
+ <translation>Alias del servidor</translation>
+ </message>
+ <message>
+ <source>URL</source>
+ <translation>URL</translation>
+ </message>
+ <message>
+ <source>Server URL</source>
+ <translation>URL del servidor</translation>
+ </message>
+ <message>
+ <source>Login</source>
+ <translation>Iniciar sesión</translation>
+ </message>
+ <message>
+ <source>User Login</source>
+ <translation>Nombre de usuario</translation>
+ </message>
+ <message>
+ <source>Client ID</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Client Secret</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Fetch unread/archived articles</source>
+ <translation>Descargar artículos por leer/archivados</translation>
+ </message>
+</context>
+<context>
+ <name>ServersPage</name>
+ <message>
+ <source>Reset database</source>
+ <translation>Reiniciar base de datos</translation>
+ </message>
+ <message>
+ <source>Settings</source>
+ <translation>Configuración</translation>
+ </message>
+ <message>
+ <source>Wallabag servers</source>
+ <translation>Servidores de Wallabag</translation>
+ </message>
+ <message>
+ <source>No servers configured yet, create your first one with the Settings menu</source>
+ <translation>Aún no hay ningún servidor configurado, agrega alguno en el menú de configuración</translation>
+ </message>
+ <message>
+ <source>Resetting database</source>
+ <translation>Reiniciando base de datos</translation>
+ </message>
+ <message>
+ <source>Deleting</source>
+ <translation>Eliminando</translation>
+ </message>
+</context>
+<context>
+ <name>SettingsPage</name>
+ <message>
+ <source>New Server</source>
+ <translation>Nuevo servidor</translation>
+ </message>
+ <message>
+ <source>Settings</source>
+ <translation>Configuración</translation>
+ </message>
+ <message>
+ <source>No server found, use the pulley menu and select 'New Server'</source>
+ <translation>No hay ningún servidor, usa el menú superior y selecciona 'Nuevo servidor'</translation>
+ </message>
+</context>
+<context>
+ <name>WallaBase</name>
+ <message>
+ <source>Server not found in the configuration</source>
+ <translation>No se encontró ningún servidor en la configuración</translation>
+ </message>
+ <message>
+ <source>Failed to parse server response: </source>
+ <translation>Error la procesar la respuesta del servidor: </translation>
+ </message>
+ <message>
+ <source>Server reply was </source>
+ <translation>La respuesta del servidor fue </translation>
+ </message>
+ <message>
+ <source>Article not found in the cache</source>
+ <translation>Artículo no encontrado en el caché</translation>
+ </message>
+</context>
+</TS>