Rename to konheko

deploy.sh

@@ -4,4 +4,4 @@ clang-format -i src/**/*.{cpp,h}
 
 #podman run -it -d --name sailfish-compiler --mount type=bind,source="$(pwd)",target=/home/nemo/build coderus/sailfishos-platform-sdk /bin/bash
 docker exec sailfish-compiler /bin/bash -c "cd build && mb2 -t SailfishOS-3.3.0.14-armv7hl build"
-scp RPMS/harbour-spoon-0.1-1.armv7hl.rpm xperia: && ssh xperia devel-su -c pkcon -y install-local harbour-spoon-0.1-1.armv7hl.rpm
+scp RPMS/harbour-konheko-0.1-1.armv7hl.rpm xperia: && ssh xperia devel-su -c pkcon -y install-local harbour-konheko-0.1-1.armv7hl.rpm

harbour-spoon.desktop → harbour-konheko.desktop

 [Desktop Entry]
 Type=Application
-Icon=harbour-spoon
-Exec=invoker -s --type=silica-qt5 /usr/bin/harbour-spoon
-Name=Spoon
+Icon=harbour-konheko
+Exec=invoker -s --type=silica-qt5 /usr/bin/harbour-konheko
+Name=Konheko
 Categories=Chat;Network
 # translation example:
 # your app name in German locale (de)
 #
 # Remember to comment out the following line, if you do not want to use
 # a different app name in German locale (de).
-Name[de]=Spoon
+Name[de]=Konheko

icons/export-pngs.sh

+#!/bin/sh
+
+cd $(dirname $0)
+
+for s in 86 108 128 172
+do
+    inkscape -C -w ${s} -h ${s} -o "${s}x${s}/harbour-konheko.png" harbour-konheko.svg
+done

icons/harbour-konheko.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="86px"
+   height="86px"
+   viewBox="0 0 86 86"
+   enable-background="new 0 0 86 86"
+   xml:space="preserve"
+   id="svg21"
+   sodipodi:docname="icon-harbour-konheko2.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/nicolas/Downloads/Sailfish-Apps-icon-template/Sailfish-Apps-icon-template/Sailfish-Apps-icon-template/harbour-konheko.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"><metadata
+   id="metadata27"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs25"><inkscape:path-effect
+     effect="mirror_symmetry"
+     start_point="30,50.815065"
+     end_point="30,53"
+     center_point="30,51.907532"
+     id="path-effect976"
+     is_visible="true"
+     lpeversion="1"
+     mode="vertical"
+     discard_orig_path="false"
+     fuse_paths="false"
+     oposite_fuse="false"
+     split_items="false" /><inkscape:path-effect
+     effect="mirror_symmetry"
+     start_point="30,53"
+     end_point="30,59"
+     center_point="30,56"
+     id="path-effect972"
+     is_visible="true"
+     lpeversion="1"
+     mode="vertical"
+     discard_orig_path="false"
+     fuse_paths="false"
+     oposite_fuse="false"
+     split_items="false" /><inkscape:path-effect
+     effect="mirror_symmetry"
+     start_point="20,37"
+     end_point="20,42"
+     center_point="20,39.5"
+     id="path-effect968"
+     is_visible="true"
+     lpeversion="1"
+     mode="vertical"
+     discard_orig_path="false"
+     fuse_paths="false"
+     oposite_fuse="false"
+     split_items="false" /><inkscape:path-effect
+     effect="mirror_symmetry"
+     start_point="41.369716,26.491528"
+     end_point="41.369716,32.318794"
+     center_point="41.369716,29.405161"
+     id="path-effect964"
+     is_visible="true"
+     lpeversion="1"
+     mode="vertical"
+     discard_orig_path="false"
+     fuse_paths="false"
+     oposite_fuse="false"
+     split_items="false" /><inkscape:path-effect
+     effect="mirror_symmetry"
+     start_point="43,52"
+     end_point="43,60"
+     center_point="43,56"
+     id="path-effect960"
+     is_visible="true"
+     lpeversion="1"
+     mode="free"
+     discard_orig_path="false"
+     fuse_paths="false"
+     oposite_fuse="false"
+     split_items="false" /><inkscape:path-effect
+     effect="mirror_symmetry"
+     start_point="23.021527,30.551982"
+     end_point="44,85"
+     center_point="44,42"
+     id="path-effect954"
+     is_visible="true"
+     lpeversion="1"
+     mode="vertical"
+     discard_orig_path="false"
+     fuse_paths="false"
+     oposite_fuse="false"
+     split_items="false" /><inkscape:path-effect
+     effect="clone_original"
+     id="path-effect897"
+     is_visible="true"
+     lpeversion="1"
+     linkeditem=""
+     method="d"
+     attributes=""
+     css_properties=""
+     allow_transforms="true" /><inkscape:path-effect
+     effect="mirror_symmetry"
+     start_point="23.021527,30.551982"
+     end_point="44,85"
+     center_point="44,42"
+     id="path-effect893"
+     is_visible="true"
+     lpeversion="1"
+     mode="vertical"
+     discard_orig_path="false"
+     fuse_paths="false"
+     oposite_fuse="false"
+     split_items="false" /><inkscape:path-effect
+     effect="clone_original"
+     id="path-effect891"
+     is_visible="false"
+     lpeversion="1"
+     linkeditem=""
+     method="d"
+     attributes=""
+     css_properties=""
+     allow_transforms="true" /></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="2560"
+   inkscape:window-height="1537"
+   id="namedview23"
+   showgrid="false"
+   inkscape:zoom="8"
+   inkscape:cx="62.509574"
+   inkscape:cy="22.275381"
+   inkscape:window-x="1080"
+   inkscape:window-y="320"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"
+   inkscape:snap-intersection-paths="true"
+   inkscape:object-paths="true"
+   inkscape:snap-smooth-nodes="true"
+   showguides="false"><inkscape:grid
+     type="xygrid"
+     id="grid47"
+     spacingx="0.1"
+     spacingy="0.1"
+     empspacing="10" /></sodipodi:namedview>
+<g
+   id="Layer_2"
+   display="none">
+</g>
+<g
+   id="Layer_1">
+	<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="0.7169"
+   y1="85.2831"
+   x2="85.2831"
+   y2="0.7169">
+		<stop
+   offset="0"
+   style="stop-color:#EB424A"
+   id="stop3" />
+		<stop
+   offset="1"
+   style="stop-color:#FF7500"
+   id="stop5" />
+	</linearGradient>
+	<path
+   fill="url(#SVGID_1_)"
+   d="M 43,0.3 C 19.417,0.3 0.3,19.418 0.3,43 v 41.277 c 0,0.786 0.637,1.423 1.423,1.423 H 43 C 66.583,85.7 85.7,66.582 85.7,43 85.7,19.3 66.7,0.3 43,0.3 Z"
+   id="path8"
+   sodipodi:nodetypes="csssscc"
+   style="fill:#333333;fill-opacity:1" />
+	
+	
+	
+	
+<path
+   style="fill:#c0def5;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="m 17.17869,30.551982 c 0,0 -1.981821,-15.686696 -0.17869,-16.551982 1.80313,-0.865286 12.800604,10.494976 12.800604,10.494976 z m 45.884449,0 c 0,0 1.981821,-15.686696 0.17869,-16.551982 -1.80313,-0.865286 -12.800604,10.494976 -12.800604,10.494976 z"
+   id="path874"
+   sodipodi:nodetypes="cscc"
+   inkscape:path-effect="#path-effect893"
+   inkscape:original-d="m 17.17869,30.551982 c 0,0 -1.981821,-15.686696 -0.17869,-16.551982 1.80313,-0.865286 12.800604,10.494976 12.800604,10.494976 z"
+   transform="matrix(1.124523,0,0,1.4895668,-2.116891,-5.8539355)" /><path
+   style="fill:#c0def5;fill-opacity:1;stroke:none;stroke-width:3.57658px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 22,32.796954 C 14.125,39.192893 11.5,52.898477 15,62.035533 17.776518,69.283875 34.25,73 43,73 c 8.75,0 25.093408,-3.376555 28,-10.964467 3.5,-9.137056 0.875,-22.84264 -7,-29.238579 -7.875,-6.395939 -34.125,-6.395939 -42,0 z"
+   id="path876"
+   sodipodi:nodetypes="ssssss" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="m 17,28.524971 c 0,0 -2.166785,-13.659685 -0.363654,-14.524971 1.80313,-0.865286 10.836875,9.524571 10.836875,9.524571 0,0 -4.041362,1.120136 -5.959884,2.064104 C 19.300794,26.677311 17,28.524971 17,28.524971 Z m 50.91956,0 c 0,0 2.166785,-13.659685 0.363654,-14.524971 -1.80313,-0.865286 -10.836875,9.524571 -10.836875,9.524571 0,0 4.041362,1.120136 5.959884,2.064104 2.212543,1.088636 4.513337,2.936296 4.513337,2.936296 z"
+   id="path874-5"
+   sodipodi:nodetypes="cscsc"
+   inkscape:path-effect="#path-effect954"
+   inkscape:original-d="m 17,28.524971 c 0,0 -2.166785,-13.659685 -0.363654,-14.524971 1.80313,-0.865286 10.836875,9.524571 10.836875,9.524571 0,0 -4.041362,1.120136 -5.959884,2.064104 C 19.300794,26.677311 17,28.524971 17,28.524971 Z"
+   transform="matrix(0.96811291,0,0,1.291272,1.8941386,-0.07780838)" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="m 43,52 c -1,0 -3.469592,-2 -3,-3 0.477894,-1.01768 5.522106,-1.01768 6,0 0.469592,1 -2,3 -3,3 z"
+   id="path956"
+   sodipodi:nodetypes="ssss" /><path
+   style="fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="m 43,52 v 4.666667 C 43,58.316583 41.494847,60 40,60 38,60 37,59 37,59 v 0 0 m 6,-7 v 4.666667 C 43,58.316583 44.505153,60 46,60 c 2,0 3,-1 3,-1 v 0 0"
+   id="path958"
+   sodipodi:nodetypes="cssccc"
+   inkscape:path-effect="#path-effect960"
+   inkscape:original-d="m 43,52 v 4.666667 C 43,58.316583 41.494847,60 40,60 38,60 37,59 37,59 v 0 0" /><path
+   style="fill:#87aade;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   id="path966"
+   transform="matrix(1.7333333,0,0,1.4575,-2.4666661,-16.215)"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   d="M 20,39.5 C 20,40.880712 19.328427,42 18.5,42 17.671573,42 17,40.880712 17,39.5 17,38.119288 17.671573,37 18.5,37 c 0.828427,0 1.5,1.119288 1.5,2.5 z m 12.461539,0 c 0,1.380712 0.671573,2.5 1.5,2.5 0.828427,0 1.5,-1.119288 1.5,-2.5 0,-1.380712 -0.671573,-2.5 -1.5,-2.5 -0.828427,0 -1.5,1.119288 -1.5,2.5 z"
+   sodipodi:type="arc"
+   sodipodi:ry="2.5"
+   sodipodi:rx="1.5"
+   sodipodi:cy="39.5"
+   sodipodi:cx="18.5"
+   inkscape:path-effect="#path-effect968" /><path
+   style="fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="m 30,53 c 0,0 -6.17342,0.793811 -9,2 -2.21082,0.943425 -6,4 -6,4 v 0 m 41,-6 c 0,0 6.17342,0.793811 9,2 2.21082,0.943425 6,4 6,4 v 0"
+   id="path970"
+   sodipodi:nodetypes="cacc"
+   inkscape:path-effect="#path-effect972"
+   inkscape:original-d="m 30,53 c 0,0 -6.17342,0.793811 -9,2 -2.21082,0.943425 -6,4 -6,4 v 0" /><path
+   style="fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="m 30,51 c 0,0 -6.028997,-0.416104 -9,0 -2.403247,0.336587 -7,2 -7,2 v 0 m 42,-2 c 0,0 6.028997,-0.416104 9,0 2.403247,0.336587 7,2 7,2 v 0"
+   id="path974"
+   sodipodi:nodetypes="cacc"
+   inkscape:path-effect="#path-effect976"
+   inkscape:original-d="m 30,51 c 0,0 -6.028997,-0.416104 -9,0 -2.403247,0.336587 -7,2 -7,2 v 0" /></g>
+</svg>

meson.build

-project('harbour-spoon', 'cpp', default_options: ['cpp_std=c++17', 'b_pie=true'])
+project('harbour-konheko', 'cpp', default_options: ['cpp_std=c++17', 'b_pie=true'])
 
 qt5 = import('qt5')
 qt5_dep = dependency('qt5', modules: ['Core', 'Qml', 'Quick', 'DBus'])
@@ -27,7 +27,7 @@ threads_dep = dependency('threads')
 qdbuscpp2xml = find_program('qdbuscpp2xml')
 gen_xml = custom_target('gen-dbus-xml',
                         input : ['src/dbusadapter.h'],
-                        output : ['dev.neko.spoon.xml'],
+                        output : ['dev.neko.konheko.xml'],
                         command : [qdbuscpp2xml, '@INPUT@', '-o', '@OUTPUT0@'],
                         install: true,
                         install_dir: 'share/dbus-1/interfaces')
@@ -55,7 +55,7 @@ moc_files = qt5.preprocess(moc_headers :
 	dependencies: deps)
 
 sources = [
-    'src/harbour-spoon.cpp',
+    'src/harbour-konheko.cpp',
     'src/client.cpp',
     'src/debug_out.cpp',
     'src/delegate_chooser.cpp',
@@ -70,34 +70,34 @@ sources = [
     'src/models/roomlistmodel.cpp'
     ]
 
-translations = qt5.compile_translations(ts_files : ['translations/harbour-spoon.ts', 'translations/harbour-spoon-de.ts'], build_by_default : true, install: true, install_dir: 'share/harbour-spoon/translations')
-executable('harbour-spoon',
+translations = qt5.compile_translations(ts_files : ['translations/harbour-konheko.ts', 'translations/harbour-konheko-de.ts'], build_by_default : true, install: true, install_dir: 'share/harbour-konheko/translations')
+executable('harbour-konheko',
 	sources, moc_files,
 	include_directories: inc,
 	dependencies : deps,
 	cpp_args : defines + extra_flags,
     cpp_pch : 'src/pch/pch.h',
-    install_rpath: '/usr/share/harbour-spoon/lib',
+    install_rpath: '/usr/share/harbour-konheko/lib',
 	install: true)
 
-install_subdir('qml', install_dir: 'share/harbour-spoon')
-install_data('harbour-spoon.desktop', install_dir: 'share/applications')
+install_subdir('qml', install_dir: 'share/harbour-konheko')
+install_data('harbour-konheko.desktop', install_dir: 'share/applications')
 
-install_data('harbour-spoon.desktop',
+install_data('harbour-konheko.desktop',
 	install_dir: 'share/applications')
 
-install_data('icons/86x86/harbour-spoon.png',
+install_data('icons/86x86/harbour-konheko.png',
 	install_dir: 'share/icons/hicolor/86x86/apps')
 
-install_data('icons/108x108/harbour-spoon.png',
+install_data('icons/108x108/harbour-konheko.png',
 	install_dir: 'share/icons/hicolor/108x108/apps')
 
-install_data('icons/128x128/harbour-spoon.png',
+install_data('icons/128x128/harbour-konheko.png',
 	install_dir: 'share/icons/hicolor/128x128/apps')
 
-#install_data('icons/256x256/harbour-spoon.png',
+#install_data('icons/256x256/harbour-konheko.png',
 #	install_dir: 'share/icons/hicolor/256x256/apps')
 
-install_data('icons/172x172/harbour-spoon.png',
+install_data('icons/172x172/harbour-konheko.png',
 	install_dir: 'share/icons/hicolor/172x172/apps')
 

qml/pages/ChatPage.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.0
 import Sailfish.Pickers 1.0
 import Sailfish.Silica 1.0
 import Sailfish.Silica.private 1.0
-import dev.neko.spoon 1.0
+import dev.neko.konheko 1.0
 
 Page {
     id: chatPage

qml/pages/Message.qml

 import QtQuick 2.0
 import Sailfish.Silica 1.0
 import "delegates"
-import dev.neko.spoon 1.0
+import dev.neko.konheko 1.0
 
 Item {
     property var modelData

qml/pages/delegates/TextMessage.qml

@@ -10,7 +10,7 @@ Text {
     color: Theme.primaryColor
     // Link color doesn't work with textFormat Text.RichText...
     //linkColor: Theme.highlightColor
-    onLinkActivated: console.log(link + " link activated")
+    onLinkActivated: Qt.openUrlExternally(link)
     wrapMode: Text.Wrap
     width: Math.min(messageText.implicitWidth, bubble.fullMessageWidth)
 }

rpm/harbour-spoon.spec → rpm/harbour-konheko.spec

@@ -3,7 +3,7 @@
 # Generated by: spectacle version 0.27
 # 
 
-Name:       harbour-spoon
+Name:       harbour-konheko
 
 # >> macros
 %define __provides_exclude_from ^%{_datadir}/.*$
@@ -22,7 +22,7 @@ Group:      Qt/Qt
 License:    LICENSE
 URL:        http://example.org/
 Source0:    %{name}-%{version}.tar.bz2
-Source100:  harbour-spoon.yaml
+Source100:  harbour-konheko.yaml
 Requires:   sailfishsilica-qt5 >= 0.10.9
 Requires:   qt5-qtmultimedia
 BuildRequires:  pkgconfig(sailfishapp) >= 1.0.2
@@ -107,6 +107,6 @@ desktop-file-install --delete-original       \
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/dbus-1/interfaces/dev.neko.spoon.xml
+%{_datadir}/dbus-1/interfaces/dev.neko.konheko.xml
 # >> files
 # << files

rpm/harbour-spoon.yaml

-Name: harbour-spoon
+Name: harbour-konheko
 Summary: Sailfish OS Matrix Client
 Version: 0.1
 Release: 1
@@ -52,7 +52,7 @@ Files:
   - '%{_datadir}/%{name}'
   - '%{_datadir}/applications/%{name}.desktop'
   - '%{_datadir}/icons/hicolor/*/apps/%{name}.png'
-  - '%{_datadir}/dbus-1/interfaces/dev.neko.spoon.xml'
+  - '%{_datadir}/dbus-1/interfaces/dev.neko.konheko.xml'
 
 # For more information about yaml and what's supported in Sailfish OS
 # build system, please see https://wiki.merproject.org/wiki/Spectacle

src/dbusactivation.cpp

@@ -4,9 +4,9 @@
 
 #include "dbusadapter.h"
 
-static const QString c_dbusServiceName = QStringLiteral("dev.neko.spoon");
-static const QString c_dbusObjectPath = QStringLiteral("/dev/neko/spoon");
-static const QString c_dbusInterface = QStringLiteral("dev.neko.spoon");
+static const QString c_dbusServiceName = QStringLiteral("dev.neko.konheko");
+static const QString c_dbusObjectPath = QStringLiteral("/dev/neko/konheko");
+static const QString c_dbusInterface = QStringLiteral("dev.neko.konheko");
 static const QString c_dbusMethod = QStringLiteral("showApp");
 
 DBusActivator::DBusActivator(QGuiApplication *parent) : app(parent) {
@@ -49,7 +49,7 @@ void DBusActivator::showApp() {
     if (!view) {
         qDebug() << "Construct view";
 
-        view = spoon::showApp(app);
+        view = konheko::showApp(app);
         connect(view, &QQuickView::destroyed, this, &DBusActivator::onViewDestroyed);
         // connect(view, &QQuickView::closing, this, &DBusActivator::onViewClosing); <- see
         // https://bugreports.qt.io/browse/QTBUG-36453