diff --git a/config/icon-lock-harbour-tooterb.png b/config/icon-lock-harbour-tooterb.png
index 0ad7dfd..6a726e4 100644
Binary files a/config/icon-lock-harbour-tooterb.png and b/config/icon-lock-harbour-tooterb.png differ
diff --git a/config/x-harbour.tooterb.activity.conf b/config/x-harbour.tooterb.activity.conf
index 440b387..95fb44c 100644
--- a/config/x-harbour.tooterb.activity.conf
+++ b/config/x-harbour.tooterb.activity.conf
@@ -1,5 +1,5 @@
-appIcon=/usr/share/harbour-tooter/config/icon-lock-harbour-tooter-beta.png
-x-nemo-icon=/usr/share/harbour-tooter/config/icon-lock-harbour-tooter-beta.png
+appIcon=/usr/share/harbour-tooterb/config/icon-lock-harbour-tooterb.png
+x-nemo-icon=/usr/share/harbour-tooterb/config/icon-lock-harbour-tooterb.png
x-nemo-priority=120
x-nemo-feedback=sms_exists
x-nemo-led-disabled-without-body-and-summary=false
diff --git a/harbour-tooterb.pro b/harbour-tooterb.pro
index 5d32a82..adf1b3e 100644
--- a/harbour-tooterb.pro
+++ b/harbour-tooterb.pro
@@ -28,7 +28,7 @@ DEFINES += "APPNAME=\\\"$${TARGET}\\\""
}
config.path = /usr/share/$${TARGET}/config/
-config.files = config/icon-lock-harbour-tooter.png
+config.files = config/icon-lock-harbour-tooterb.png
notification_categories.path = /usr/share/lipstick/notificationcategories
notification_categories.files = config/x-harbour.tooterb.activity.*
@@ -55,6 +55,7 @@ HEADERS += src/dbus.h
DISTFILES += qml/harbour-tooterb.qml \
config/icon-lock-harbour-tooterb.png \
+ qml/images/tooterb.svg \
qml/pages/components/VisualContainer.qml \
qml/pages/components/MiniStatus.qml \
qml/pages/components/MiniHeader.qml \
@@ -77,7 +78,6 @@ DISTFILES += qml/harbour-tooterb.qml \
qml/images/notification.svg \
qml/images/verified.svg \
qml/images/boosted.svg \
- qml/images/tooter.svg \
qml/images/emojiselect.svg \
qml/images/icon-m-profile.svg \
qml/images/icon-l-profile.svg \
diff --git a/harbour-tooterb.pro.user b/harbour-tooterb.pro.user
new file mode 100644
index 0000000..9baea29
--- /dev/null
+++ b/harbour-tooterb.pro.user
@@ -0,0 +1,799 @@
+
+
+
+
+
+ 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
+
+
+
+ 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/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/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/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
+ 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
+
+
+
+
+ true
+ Prepare Target
+
+ QmakeProjectManager.MerPrepareTargetStep
+
+
+ true
+ RPM
+
+ QmakeProjectManager.MerRpmDeployStep
+
+ 2
+ Deploy
+
+ ProjectExplorer.BuildSteps.Deploy
+
+ 1
+ Deploy As RPM Package
+
+ QmakeProjectManager.MerRpmDeployConfiguration
+
+ 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/harbour-tooter-master
+ false
+ -1
+ 3
+
+ 1
+
+
+ harbour-tooterb (on Sailfish OS Emulator 3.2.1.20)
+ QmakeProjectManager.MerRunConfiguration:C:/Users/XPAM/Github/harbour-tooter-master/harbour-tooterb.pro
+ 1
+
+ false
+
+ 3768
+ false
+ true
+ false
+ false
+ true
+
+
+
+ 1
+
+
+
+ ProjectExplorer.Project.Target.1
+
+ 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
+ 0
+ 0
+
+ C:/Users/XPAM/Github/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/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/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
+ 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
+
+
+
+
+ true
+ Prepare Target
+
+ QmakeProjectManager.MerPrepareTargetStep
+
+
+ true
+ RPM
+
+ QmakeProjectManager.MerRpmDeployStep
+
+ 2
+ Deploy
+
+ ProjectExplorer.BuildSteps.Deploy
+
+ 1
+ Deploy As RPM Package
+
+ QmakeProjectManager.MerRpmDeployConfiguration
+
+ 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/harbour-tooter-master
+ false
+ -1
+ 3
+
+ 1
+
+
+ harbour-tooterb (on Sailfish OS Emulator 3.2.1.20)
+ QmakeProjectManager.MerRunConfiguration:C:/Users/XPAM/Github/harbour-tooter-master/harbour-tooterb.pro
+ 1
+
+ false
+
+ 3768
+ false
+ true
+ false
+ false
+ true
+
+
+
+ 1
+
+
+
+ ProjectExplorer.Project.TargetCount
+ 2
+
+
+ ProjectExplorer.Project.Updater.FileVersion
+ 21
+
+
+ Version
+ 21
+
+
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
index d109df9..2383490 100644
--- a/qml/cover/CoverPage.qml
+++ b/qml/cover/CoverPage.qml
@@ -58,7 +58,7 @@ CoverBackground {
verticalAlignment: Image.AlignBottom
fillMode: Image.PreserveAspectFit
- source: "../images/tooter.svg"
+ source: "../images/tooterb.svg"
}
Timer {
id: timer
diff --git a/qml/images/tooterb.svg b/qml/images/tooterb.svg
new file mode 100644
index 0000000..8af076f
--- /dev/null
+++ b/qml/images/tooterb.svg
@@ -0,0 +1,38 @@
+
+
+
diff --git a/rpm/harbour-tooterb.changes b/rpm/harbour-tooterb.changes
index c708a4b..3b567e5 100644
--- a/rpm/harbour-tooterb.changes
+++ b/rpm/harbour-tooterb.changes
@@ -1,3 +1,6 @@
+*Wed May 06 2020 molan 1.0.4-2
+- Beta release
+
* Thu Apr 16 2020 Dusko Angirevic 1.0.4-1
- Merge with molan code
diff --git a/rpm/harbour-tooterb.changes.run.in b/rpm/harbour-tooterb.changes.run.in
index c6fa648..a3693d6 100644
--- a/rpm/harbour-tooterb.changes.run.in
+++ b/rpm/harbour-tooterb.changes.run.in
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Rename this file as harbour-tooter.changes.run to let mb2 automatically
+# Rename this file as harbour-tooterb.changes.run to let mb2 automatically
# generate changelog from well formatted Git commit messages and tag
# annotations.
diff --git a/rpm/harbour-tooterb.spec b/rpm/harbour-tooterb.spec
index b7a3aa7..42b36d8 100644
--- a/rpm/harbour-tooterb.spec
+++ b/rpm/harbour-tooterb.spec
@@ -29,7 +29,7 @@ BuildRequires: pkgconfig(nemonotifications-qt5)
BuildRequires: desktop-file-utils
%description
-Tooter is native client for Mastodon network instances.
+Tooter Beta is a native client for Mastodon network instances.
%prep
diff --git a/rpm/harbour-tooterb.yaml b/rpm/harbour-tooterb.yaml
index 3908ac2..c7f90b9 100644
--- a/rpm/harbour-tooterb.yaml
+++ b/rpm/harbour-tooterb.yaml
@@ -12,7 +12,7 @@ License: LICENSE
Sources:
- '%{name}-%{version}.tar.bz2'
Description: |
- Tooter is native client for Mastodon network instances.
+ Tooter Beta is a native client for Mastodon network instances.
Configure: none
# The qtc5 builder inserts macros to allow QtCreator to have fine
# control over qmake/make execution
diff --git a/src/dbus.h b/src/dbus.h
index 4bb863b..d533a18 100644
--- a/src/dbus.h
+++ b/src/dbus.h
@@ -5,7 +5,7 @@
#include
#include "dbusAdaptor.h"
-#define SERVICE_NAME "ba.dysko.harbour.tooter"
+#define SERVICE_NAME "ba.dysko.harbour.tooterb"
class QDBusInterface;
class Dbus : public QObject
diff --git a/translations/harbour-tooterb-it.ts b/translations/harbour-tooterb-it.ts
index f28be92..e168a6f 100644
--- a/translations/harbour-tooterb-it.ts
+++ b/translations/harbour-tooterb-it.ts
@@ -53,7 +53,6 @@
Pubblico
-
Non elencato
@@ -205,72 +204,72 @@
Profile
-
+
Sintesi
-
+
Seguaci
-
+
Segue
-
+
Toots
-
+
Apprezzati
-
+
Smetti di seguire
-
+
Richiesta di seguito inviata!
-
+
Segui
-
+
Non silenziare
-
+
Silenzia
-
+
Sblocca
-
+
Blocca
-
+
Biografia
-
+
Aprire profile nel browser
@@ -278,92 +277,92 @@
Settings
-
+
Impostazione
-
+
Rimozione del account
-
+
Aggiungi account
-
+
Annullare l'autorizzazione dell'app e rimuovere l'account
-
+
Autorizzare l'app all'utilizzo del conto Mastodon
-
+
Caricare immagini nei toots
-
+
Disabilitare questa opzione per conservare connessione dati
-
+
Tradurre
-
+
Utilizzare Transifex per aiutare nella traduzione dell'app
-
+
Sviluppo
-
+
Design UI/UX e sviluppo
-
+
Identità visiva
-
+
Sviluppo e traduzioni
-
+
Traduzione francese e occitanica
-
+
Traduzione cinese
-
+
Traduzione olandese
-
+
Traduzione spagnola
-
+
Aggiunto file README