From ee4af6607263dce205b5a5ae4da3ed34c5f8f0a5 Mon Sep 17 00:00:00 2001 From: Carlo Baratto Date: Mon, 24 Aug 2026 13:41:07 +0200 Subject: [PATCH] Rinomina in harbour-tide --- README.md | 6 ++--- harbour-maree.pro => harbour-tide.pro | 24 +++++++++--------- .../{harbour-maree.png => harbour-tide.png} | Bin .../{harbour-maree.png => harbour-tide.png} | Bin .../{harbour-maree.png => harbour-tide.png} | Bin .../{harbour-maree.png => harbour-tide.png} | Bin icons/make_icons.py | 2 +- qml/{harbour-maree.qml => harbour-tide.qml} | 0 ...our-maree.desktop => harbour-tide.desktop} | 4 +-- rpm/{harbour-maree.spec => harbour-tide.spec} | 4 +-- src/main.cpp | 14 +++++----- src/settings.cpp | 2 +- .../{harbour-maree.ts => harbour-tide.ts} | 0 ...harbour-maree_it.ts => harbour-tide_it.ts} | 0 14 files changed, 28 insertions(+), 28 deletions(-) rename harbour-maree.pro => harbour-tide.pro (64%) rename icons/108x108/{harbour-maree.png => harbour-tide.png} (100%) rename icons/128x128/{harbour-maree.png => harbour-tide.png} (100%) rename icons/172x172/{harbour-maree.png => harbour-tide.png} (100%) rename icons/86x86/{harbour-maree.png => harbour-tide.png} (100%) rename qml/{harbour-maree.qml => harbour-tide.qml} (100%) rename rpm/{harbour-maree.desktop => harbour-tide.desktop} (94%) rename rpm/{harbour-maree.spec => harbour-tide.spec} (96%) rename translations/{harbour-maree.ts => harbour-tide.ts} (100%) rename translations/{harbour-maree_it.ts => harbour-tide_it.ts} (100%) diff --git a/README.md b/README.md index 79f871e..6ba5b81 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# harbour-maree +# harbour-tide Previsioni di marea **universali** per Sailfish OS — client nativo Silica con motore armonico locale (nessuna API di maree: calcolo offline, per sempre). @@ -47,14 +47,14 @@ qml/pages/ MainPage (porti + ricerca libera), DetailPage (grafico canvas, eventi, card porto vicino, astro), SettingsPage (lingua, unità, intervallo, porto) qml/cover/ cover con porto preferito e prossima marea -translations/ harbour-maree.ts (EN sorgente), harbour-maree_it.ts +translations/ harbour-tide.ts (EN sorgente), harbour-tide_it.ts icons/ icone 86/108/128/172 (make_icons.py, stile harbour) rpm/ spec e desktop file (SailJail: Internet) ``` ## Configurazione -File: `~/.config/harbour/maree/maree.conf` (QSettings, zona persistente +File: `~/.config/harbour/tide/tide.conf` (QSettings, zona persistente della sandbox SailJail). Chiavi: `language` (system/en/it), `preferredPort`, `unit` (m/ft), `days` (1/2/3). diff --git a/harbour-maree.pro b/harbour-tide.pro similarity index 64% rename from harbour-maree.pro rename to harbour-tide.pro index fcddb63..4121151 100644 --- a/harbour-maree.pro +++ b/harbour-tide.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = harbour-maree +TARGET = harbour-tide CONFIG += sailfishapp CONFIG += c++11 @@ -12,31 +12,31 @@ HEADERS += \ src/settings.h OTHER_FILES += \ - qml/harbour-maree.qml \ + qml/harbour-tide.qml \ qml/pages/*.qml \ qml/cover/*.qml \ qml/js/*.js \ - rpm/harbour-maree.spec \ - rpm/harbour-maree.desktop \ - translations/harbour-maree.ts \ - translations/harbour-maree_it.ts + rpm/harbour-tide.spec \ + rpm/harbour-tide.desktop \ + translations/harbour-tide.ts \ + translations/harbour-tide_it.ts DISTFILES += $$OTHER_FILES # Le traduzioni NON sono gestite dal template sailfishapp_i18n sul kit 5.1 # (il .qm non viene generato/installato in modo affidabile). Lo spec compila -# il catalogo con lrelease e lo installa in /usr/share/harbour-maree/translations; +# il catalogo con lrelease e lo installa in /usr/share/harbour-tide/translations; # main.cpp carica il catalogo italiano esplicitamente (pattern calibreweb). -# Le stringhe sorgente sono INGLESI (lingua di default); harbour-maree_it.ts +# Le stringhe sorgente sono INGLESI (lingua di default); harbour-tide_it.ts # fornisce il catalogo italiano. # Icone installate via make install (struttura standard hicolor) icons86.path = /usr/share/icons/hicolor/86x86/apps -icons86.files = $$PWD/icons/86x86/harbour-maree.png +icons86.files = $$PWD/icons/86x86/harbour-tide.png icons108.path = /usr/share/icons/hicolor/108x108/apps -icons108.files = $$PWD/icons/108x108/harbour-maree.png +icons108.files = $$PWD/icons/108x108/harbour-tide.png icons128.path = /usr/share/icons/hicolor/128x128/apps -icons128.files = $$PWD/icons/128x128/harbour-maree.png +icons128.files = $$PWD/icons/128x128/harbour-tide.png icons172.path = /usr/share/icons/hicolor/172x172/apps -icons172.files = $$PWD/icons/172x172/harbour-maree.png +icons172.files = $$PWD/icons/172x172/harbour-tide.png INSTALLS += icons86 icons108 icons128 icons172 diff --git a/icons/108x108/harbour-maree.png b/icons/108x108/harbour-tide.png similarity index 100% rename from icons/108x108/harbour-maree.png rename to icons/108x108/harbour-tide.png diff --git a/icons/128x128/harbour-maree.png b/icons/128x128/harbour-tide.png similarity index 100% rename from icons/128x128/harbour-maree.png rename to icons/128x128/harbour-tide.png diff --git a/icons/172x172/harbour-maree.png b/icons/172x172/harbour-tide.png similarity index 100% rename from icons/172x172/harbour-maree.png rename to icons/172x172/harbour-tide.png diff --git a/icons/86x86/harbour-maree.png b/icons/86x86/harbour-tide.png similarity index 100% rename from icons/86x86/harbour-maree.png rename to icons/86x86/harbour-tide.png diff --git a/icons/make_icons.py b/icons/make_icons.py index 8f76caf..57d4727 100644 --- a/icons/make_icons.py +++ b/icons/make_icons.py @@ -72,7 +72,7 @@ def draw_icon(size): def main(): for s in (86, 108, 128, 172): os.makedirs(f"icons/{s}x{s}", exist_ok=True) - draw_icon(s).save(f"icons/{s}x{s}/harbour-maree.png") + draw_icon(s).save(f"icons/{s}x{s}/harbour-tide.png") print("icone scritte: 86, 108, 128, 172") diff --git a/qml/harbour-maree.qml b/qml/harbour-tide.qml similarity index 100% rename from qml/harbour-maree.qml rename to qml/harbour-tide.qml diff --git a/rpm/harbour-maree.desktop b/rpm/harbour-tide.desktop similarity index 94% rename from rpm/harbour-maree.desktop rename to rpm/harbour-tide.desktop index 3ec1a51..6da05cf 100644 --- a/rpm/harbour-maree.desktop +++ b/rpm/harbour-tide.desktop @@ -3,8 +3,8 @@ Name=Maree Name[it_IT]=Maree Comment=Universal tide predictions Comment[it_IT]=Previsioni di marea universali -Exec=harbour-maree -Icon=harbour-maree +Exec=harbour-tide +Icon=harbour-tide Type=Application X-Nemo-Application-Type=silica-qt5 Categories=Utility; diff --git a/rpm/harbour-maree.spec b/rpm/harbour-tide.spec similarity index 96% rename from rpm/harbour-maree.spec rename to rpm/harbour-tide.spec index c00281b..354f032 100644 --- a/rpm/harbour-maree.spec +++ b/rpm/harbour-tide.spec @@ -1,10 +1,10 @@ -Name: harbour-maree +Name: harbour-tide Summary: Universal tide predictions Version: 0.1.0 Release: 1 Group: Qt/Qt License: MIT -URL: https://git.hackatoniclife.com/kaneda/harbour-maree +URL: https://git.hackatoniclife.com/kaneda/harbour-tide Source0: %{name}-%{version}.tar.gz Source1: %{name}.desktop diff --git a/src/main.cpp b/src/main.cpp index 0ab5df8..ce9fdd1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,7 +15,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) // Identita' allineata al profilo X-Sailjail del desktop file: // AppConfigLocation = ~/.config/harbour/maree (zona persistente della sandbox). app->setOrganizationName(QStringLiteral("harbour")); - app->setApplicationName(QStringLiteral("maree")); + app->setApplicationName(QStringLiteral("tide")); app->setApplicationVersion(QStringLiteral("0.1.0")); Settings settings; @@ -24,7 +24,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) // lingua UI di Sailfish, "en" forza l'inglese (default, stringhe sorgente), // "it" carica il catalogo italiano dal data dir dell'app (il validatore // RPM rifiuta /usr/share/translations, quindi il .qm sta in - // /usr/share/harbour-maree/translations e libsailfishapp non lo carica). + // /usr/share/harbour-tide/translations e libsailfishapp non lo carica). QString lang = settings.language(); if (lang == QLatin1String("system")) { const QString sys = QLocale::system().name(); @@ -38,23 +38,23 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) t->deleteLater(); } QTranslator *translator = new QTranslator(app); - if (translator->load(QStringLiteral("harbour-maree_it"), - QStringLiteral("/usr/share/harbour-maree/translations"))) { + if (translator->load(QStringLiteral("harbour-tide_it"), + QStringLiteral("/usr/share/harbour-tide/translations"))) { app->installTranslator(translator); } else { - qWarning("harbour-maree: cannot load harbour-maree_it.qm"); + qWarning("harbour-tide: cannot load harbour-tide_it.qm"); } } QQuickView *view = SailfishApp::createView(); - qDebug() << "harbour-maree v0.1.0 build" << __DATE__ << __TIME__; + qDebug() << "harbour-tide v0.1.0 build" << __DATE__ << __TIME__; view->rootContext()->setContextProperty(QStringLiteral("appSettings"), &settings); view->rootContext()->setContextProperty(QStringLiteral("appVersion"), QCoreApplication::applicationVersion()); - view->setSource(SailfishApp::pathTo(QStringLiteral("qml/harbour-maree.qml"))); + view->setSource(SailfishApp::pathTo(QStringLiteral("qml/harbour-tide.qml"))); view->show(); return app->exec(); diff --git a/src/settings.cpp b/src/settings.cpp index 0b2f53d..4918006 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -2,7 +2,7 @@ Settings::Settings(QObject *parent) : QObject(parent) - , m_settings(QStringLiteral("harbour"), QStringLiteral("maree")) + , m_settings(QStringLiteral("harbour"), QStringLiteral("tide")) { } diff --git a/translations/harbour-maree.ts b/translations/harbour-tide.ts similarity index 100% rename from translations/harbour-maree.ts rename to translations/harbour-tide.ts diff --git a/translations/harbour-maree_it.ts b/translations/harbour-tide_it.ts similarity index 100% rename from translations/harbour-maree_it.ts rename to translations/harbour-tide_it.ts