mirror of
https://github.com/Ximi1970/systray-x.git
synced 2025-10-26 07:46:09 +01:00
Merge branch 'feature-tb84' into develop
This commit is contained in:
42
README.md
42
README.md
@@ -250,6 +250,48 @@ sudo dnf install systray-x-minimal
|
||||
```
|
||||
|
||||
|
||||
### Arch
|
||||
|
||||
#### Repository
|
||||
|
||||
Installing the repository:
|
||||
|
||||
```bash
|
||||
wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Arch/x86_64/home_Ximi1970_Mozilla_Add-ons_Arch.key
|
||||
sudo pacman-key --add home_Ximi1970_Mozilla_Add-ons_Arch.key
|
||||
sudo pacman-key --lsign-key BEEF5C3607D86FE9
|
||||
sudo echo -e "\n[home_Ximi1970_Mozilla_Add-ons_Arch]\nSigLevel = PackageOptional\nServer = https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Arch/x86_64" | sudo tee -a /etc/pacman.conf
|
||||
sudo pacman -Syyu
|
||||
```
|
||||
|
||||
#### Package
|
||||
|
||||
Installing the SysTray-X addon and companion app package:
|
||||
|
||||
###### KDE
|
||||
|
||||
```bash
|
||||
sudo pacman -S systray-x
|
||||
```
|
||||
|
||||
###### GNOME
|
||||
|
||||
```bash
|
||||
sudo pacman -S systray-x-gnome
|
||||
```
|
||||
Please use `Tweaks` to activate the gnome shell extension `Kstatusnotifieritem/appindicator support` or reboot the system.
|
||||
|
||||
``` bash
|
||||
sudo pacman -S gnome-tweaks
|
||||
```
|
||||
|
||||
###### XFCE / Others (non-KDE, non-GNOME)
|
||||
|
||||
```bash
|
||||
sudo pacman -S systray-x-minimal
|
||||
```
|
||||
|
||||
|
||||
## Binaries (User)
|
||||
|
||||
User installable package.
|
||||
|
||||
@@ -148,7 +148,6 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent )
|
||||
connect( m_link, &SysTrayXLink::signalErrorAddOnShutdown, this, &SysTrayX::slotErrorAddOnShutdown );
|
||||
connect( m_link, &SysTrayXLink::signalWindowState, m_win_ctrl, &WindowCtrl::slotWindowState );
|
||||
connect( m_link, &SysTrayXLink::signalUnreadMail, this, &SysTrayX::slotSetUnreadMail );
|
||||
connect( m_link, &SysTrayXLink::signalTitle, m_win_ctrl, &WindowCtrl::slotWindowTitle );
|
||||
connect( m_link, &SysTrayXLink::signalVersion, this, &SysTrayX::slotVersion );
|
||||
connect( m_link, &SysTrayXLink::signalKdeIntegration, this, &SysTrayX::slotSelectIconObject );
|
||||
connect( m_link, &SysTrayXLink::signalLocale, this, &SysTrayX::slotLoadLanguage );
|
||||
|
||||
@@ -255,13 +255,13 @@ void SysTrayXLink::sendShutdown()
|
||||
*/
|
||||
void SysTrayXLink::sendDisableKdeIntegration()
|
||||
{
|
||||
QJsonObject shutdownObject;
|
||||
shutdownObject.insert("kdeIntegration", QJsonValue::fromVariant( "false" ) );
|
||||
QJsonObject integrationObject;
|
||||
integrationObject.insert("kdeIntegration", QJsonValue::fromVariant( "false" ) );
|
||||
|
||||
/*
|
||||
* Store the new document
|
||||
*/
|
||||
QJsonDocument json_doc = QJsonDocument( shutdownObject );
|
||||
QJsonDocument json_doc = QJsonDocument( integrationObject );
|
||||
|
||||
/*
|
||||
* Send it to the add-on
|
||||
@@ -296,12 +296,6 @@ void SysTrayXLink::DecodeMessage( const QByteArray& message )
|
||||
emit signalUnreadMail( unreadMail );
|
||||
}
|
||||
|
||||
if( jsonObject.contains( "title" ) && jsonObject[ "title" ].isString() )
|
||||
{
|
||||
QString title = jsonObject[ "title" ].toString();
|
||||
emit signalTitle( title );
|
||||
}
|
||||
|
||||
if( jsonObject.contains( "version" ) && jsonObject[ "version" ].isString() )
|
||||
{
|
||||
QString version = jsonObject[ "version" ].toString();
|
||||
|
||||
@@ -126,23 +126,6 @@ void WindowCtrl::slotWindowTest3()
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Handle window title signal
|
||||
*/
|
||||
void WindowCtrl::slotWindowTitle( QString title )
|
||||
{
|
||||
/*
|
||||
* Store the window title
|
||||
*/
|
||||
m_window_title = title;
|
||||
|
||||
/*
|
||||
* Get the window IDs
|
||||
*/
|
||||
findWindow( title );
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Handle change in minimize type change
|
||||
*/
|
||||
|
||||
@@ -71,13 +71,6 @@ class WindowCtrl : public QObject
|
||||
*/
|
||||
void slotWindowTest3();
|
||||
|
||||
/**
|
||||
* @brief slotWindowTitle. Handle the window title signal.
|
||||
*
|
||||
* @param state The windows title.
|
||||
*/
|
||||
void slotWindowTitle( QString title );
|
||||
|
||||
/**
|
||||
* @brief slotMinimizeTypeChange. Handle the minimize type signal.
|
||||
*/
|
||||
@@ -127,11 +120,6 @@ class WindowCtrl : public QObject
|
||||
*/
|
||||
QWindow* m_tb_window;
|
||||
|
||||
/**
|
||||
* @brief m_window_title. Title of the TB window.
|
||||
*/
|
||||
QString m_window_title;
|
||||
|
||||
/**
|
||||
* @brief m_start_minimized. State of start minimized.
|
||||
*/
|
||||
|
||||
58
dist/arch/gnome/PKGBUILD
vendored
Normal file
58
dist/arch/gnome/PKGBUILD
vendored
Normal file
@@ -0,0 +1,58 @@
|
||||
# Maintainer: Maxime Rijnders <ximi.obs@gmail.com>
|
||||
|
||||
pkgname=systray-x-gnome
|
||||
pkgver=0
|
||||
pkgrel=0
|
||||
epoch=1
|
||||
pkgdesc='A system tray extension for Thunderbird 68+ (GNOME)'
|
||||
arch=(x86_64)
|
||||
url=https://github.com/Ximi1970/systray-x
|
||||
license=(MPL-2.0)
|
||||
depends=(
|
||||
'qt5-base'
|
||||
'gnome-shell-extension-appindicator'
|
||||
'thunderbird>=68'
|
||||
'thunderbird<=84'
|
||||
)
|
||||
makedepends=(
|
||||
'git'
|
||||
'unzip'
|
||||
'zip'
|
||||
'libx11'
|
||||
'qt5-base'
|
||||
)
|
||||
provides=(
|
||||
'systray-x'
|
||||
)
|
||||
source=($pkgname-$pkgver.tar.xz)
|
||||
sha256sums=(SKIP)
|
||||
install=systray-x-gnome.install
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
export VERSION=$(cat dist/rpm/VERSION | grep VERSION | sed -e "s/VERSION=\(.*\)/\1/")
|
||||
|
||||
export VERSION_MAJOR=$(echo $VERSION | cut -d'.' -f1)
|
||||
export VERSION_MINOR=$(echo $VERSION | cut -d'.' -f2)
|
||||
export VERSION_PATCH=$(echo $VERSION | cut -d'.' -f3)
|
||||
|
||||
export BUILD_NUMBER=$(cat dist/rpm/VERSION | grep BUILD_NUMBER | sed -e "s/BUILD_NUMBER=\(.*\)/\1/")
|
||||
export GIT_HASH=$(cat dist/rpm/VERSION | grep GIT_HASH | sed -e "s/GIT_HASH=\(.*\)/\1/")
|
||||
export GIT_BRANCH=$(cat dist/rpm/VERSION | grep GIT_BRANCH | sed -e "s/GIT_BRANCH=\(.*\)/\1/")
|
||||
|
||||
sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|/usr/bin/SysTray-X|' > SysTray_X.json
|
||||
|
||||
make OPTIONS="DEFINES+=NO_KDE_INTEGRATION" EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$VERSION_MAJOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$VERSION_MINOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$VERSION_PATCH\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$BUILD_NUMBER\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$GIT_HASH\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$GIT_BRANCH\\\\\\\\\\\\\\\""
|
||||
}
|
||||
|
||||
package() {
|
||||
mkdir -p "${pkgdir}"/usr/bin
|
||||
cp -f ${pkgname}-${pkgver}/app/build/SysTray-X "${pkgdir}"/usr/bin/SysTray-X
|
||||
|
||||
mkdir -p "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts
|
||||
cp -f ${pkgname}-${pkgver}/SysTray_X.json "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts/SysTray_X.json
|
||||
|
||||
mkdir -p "${pkgdir}"/usr/lib/thunderbird/distribution/extensions
|
||||
cp -f ${pkgname}-${pkgver}/systray-x@Ximi1970.xpi "${pkgdir}"/usr/lib//thunderbird/distribution/extensions/systray-x@Ximi1970.xpi
|
||||
}
|
||||
56
dist/arch/gnome/systray-x-gnome.install
vendored
Normal file
56
dist/arch/gnome/systray-x-gnome.install
vendored
Normal file
@@ -0,0 +1,56 @@
|
||||
post_install() {
|
||||
PROF_DIR="/etc/dconf/profile"
|
||||
PROF_FILE="user"
|
||||
|
||||
if [ -f ${PROF_DIR}/${PROF_FILE} ] ; then
|
||||
#
|
||||
# Edit user file
|
||||
#
|
||||
grep -q "user-db:user" ${PROF_DIR}/${PROF_FILE}
|
||||
if [ "$?" = "1" ] ; then
|
||||
echo "user-db:user" >> ${PROF_DIR}/${PROF_FILE}
|
||||
fi
|
||||
|
||||
grep -q "system-db:local" ${PROF_DIR}/${PROF_FILE}
|
||||
if [ "$?" = "1" ] ; then
|
||||
echo "system-db:local" >> ${PROF_DIR}/${PROF_FILE}
|
||||
fi
|
||||
else
|
||||
#
|
||||
# Generate user file
|
||||
#
|
||||
mkdir -p ${PROF_DIR}
|
||||
cat >${PROF_DIR}/${PROF_FILE} <<EOF
|
||||
user-db:user
|
||||
system-db:local
|
||||
EOF
|
||||
fi
|
||||
|
||||
EXTENSION="appindicatorsupport@rgcjonas.gmail.com"
|
||||
CONF_DIR="/etc/dconf/db/local.d"
|
||||
CONF_FILE="00-extensions"
|
||||
|
||||
if [ -f ${CONF_DIR}/${CONF_FILE} ] ; then
|
||||
#
|
||||
# Edit extensions file
|
||||
#
|
||||
grep -q ${EXTENSION} ${CONF_DIR}/${CONF_FILE}
|
||||
if [ "$?" == "1" ] ; then
|
||||
sed -i -e "s/\(enabled-extensions=\[.*\)\]/\1, '${EXTENSION}'\]/" ${CONF_DIR}/${CONF_FILE}
|
||||
fi
|
||||
else
|
||||
#
|
||||
# Generate extensions file
|
||||
#
|
||||
mkdir -p ${CONF_DIR}
|
||||
cat >${CONF_DIR}/${CONF_FILE} <<EOF
|
||||
[org/gnome/shell]
|
||||
# List all extensions that you want to have enabled for all users
|
||||
enabled-extensions=['appindicatorsupport@rgcjonas.gmail.com']
|
||||
EOF
|
||||
fi
|
||||
#
|
||||
if [ -x /usr/bin/dconf ] ; then
|
||||
dconf update
|
||||
fi
|
||||
}
|
||||
58
dist/arch/kde/PKGBUILD
vendored
Normal file
58
dist/arch/kde/PKGBUILD
vendored
Normal file
@@ -0,0 +1,58 @@
|
||||
# Maintainer: Maxime Rijnders <ximi.obs@gmail.com>
|
||||
|
||||
pkgname=systray-x
|
||||
pkgver=0
|
||||
pkgrel=0
|
||||
epoch=1
|
||||
pkgdesc='A system tray extension for Thunderbird 68+ (KDE)'
|
||||
arch=(x86_64)
|
||||
url=https://github.com/Ximi1970/systray-x
|
||||
license=(MPL-2.0)
|
||||
depends=(
|
||||
'qt5-base'
|
||||
'knotifications'
|
||||
'thunderbird>=68'
|
||||
'thunderbird<=84'
|
||||
)
|
||||
makedepends=(
|
||||
'git'
|
||||
'unzip'
|
||||
'zip'
|
||||
'libx11'
|
||||
'qt5-base'
|
||||
'knotifications'
|
||||
)
|
||||
provides=(
|
||||
'systray-x'
|
||||
)
|
||||
source=($pkgname-$pkgver.tar.xz)
|
||||
sha256sums=(SKIP)
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
export VERSION=$(cat dist/rpm/VERSION | grep VERSION | sed -e "s/VERSION=\(.*\)/\1/")
|
||||
|
||||
export VERSION_MAJOR=$(echo $VERSION | cut -d'.' -f1)
|
||||
export VERSION_MINOR=$(echo $VERSION | cut -d'.' -f2)
|
||||
export VERSION_PATCH=$(echo $VERSION | cut -d'.' -f3)
|
||||
|
||||
export BUILD_NUMBER=$(cat dist/rpm/VERSION | grep BUILD_NUMBER | sed -e "s/BUILD_NUMBER=\(.*\)/\1/")
|
||||
export GIT_HASH=$(cat dist/rpm/VERSION | grep GIT_HASH | sed -e "s/GIT_HASH=\(.*\)/\1/")
|
||||
export GIT_BRANCH=$(cat dist/rpm/VERSION | grep GIT_BRANCH | sed -e "s/GIT_BRANCH=\(.*\)/\1/")
|
||||
|
||||
sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|/usr/bin/SysTray-X|' > SysTray_X.json
|
||||
|
||||
make EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$VERSION_MAJOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$VERSION_MINOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$VERSION_PATCH\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$BUILD_NUMBER\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$GIT_HASH\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$GIT_BRANCH\\\\\\\\\\\\\\\""
|
||||
}
|
||||
|
||||
package() {
|
||||
mkdir -p "${pkgdir}"/usr/bin
|
||||
cp -f ${pkgname}-${pkgver}/app/build/SysTray-X "${pkgdir}"/usr/bin/SysTray-X
|
||||
|
||||
mkdir -p "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts
|
||||
cp -f ${pkgname}-${pkgver}/SysTray_X.json "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts/SysTray_X.json
|
||||
|
||||
mkdir -p "${pkgdir}"/usr/lib/thunderbird/distribution/extensions
|
||||
cp -f ${pkgname}-${pkgver}/systray-x@Ximi1970.xpi "${pkgdir}"/usr/lib//thunderbird/distribution/extensions/systray-x@Ximi1970.xpi
|
||||
}
|
||||
56
dist/arch/minimal/PKGBUILD
vendored
Normal file
56
dist/arch/minimal/PKGBUILD
vendored
Normal file
@@ -0,0 +1,56 @@
|
||||
# Maintainer: Maxime Rijnders <ximi.obs@gmail.com>
|
||||
|
||||
pkgname=systray-x-minimal
|
||||
pkgver=0
|
||||
pkgrel=0
|
||||
epoch=1
|
||||
pkgdesc='A system tray extension for Thunderbird 68+ (Unity/XFCE/other)'
|
||||
arch=(x86_64)
|
||||
url=https://github.com/Ximi1970/systray-x
|
||||
license=(MPL-2.0)
|
||||
depends=(
|
||||
'qt5-base'
|
||||
'thunderbird>=68'
|
||||
'thunderbird<=84'
|
||||
)
|
||||
makedepends=(
|
||||
'git'
|
||||
'unzip'
|
||||
'zip'
|
||||
'libx11'
|
||||
'qt5-base'
|
||||
)
|
||||
provides=(
|
||||
'systray-x'
|
||||
)
|
||||
source=($pkgname-$pkgver.tar.xz)
|
||||
sha256sums=(SKIP)
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
export VERSION=$(cat dist/rpm/VERSION | grep VERSION | sed -e "s/VERSION=\(.*\)/\1/")
|
||||
|
||||
export VERSION_MAJOR=$(echo $VERSION | cut -d'.' -f1)
|
||||
export VERSION_MINOR=$(echo $VERSION | cut -d'.' -f2)
|
||||
export VERSION_PATCH=$(echo $VERSION | cut -d'.' -f3)
|
||||
|
||||
export BUILD_NUMBER=$(cat dist/rpm/VERSION | grep BUILD_NUMBER | sed -e "s/BUILD_NUMBER=\(.*\)/\1/")
|
||||
export GIT_HASH=$(cat dist/rpm/VERSION | grep GIT_HASH | sed -e "s/GIT_HASH=\(.*\)/\1/")
|
||||
export GIT_BRANCH=$(cat dist/rpm/VERSION | grep GIT_BRANCH | sed -e "s/GIT_BRANCH=\(.*\)/\1/")
|
||||
|
||||
sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|/usr/bin/SysTray-X|' > SysTray_X.json
|
||||
|
||||
make OPTIONS="DEFINES+=NO_KDE_INTEGRATION" EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$VERSION_MAJOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$VERSION_MINOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$VERSION_PATCH\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$BUILD_NUMBER\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$GIT_HASH\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$GIT_BRANCH\\\\\\\\\\\\\\\""
|
||||
}
|
||||
|
||||
package() {
|
||||
mkdir -p "${pkgdir}"/usr/bin
|
||||
cp -f ${pkgname}-${pkgver}/app/build/SysTray-X "${pkgdir}"/usr/bin/SysTray-X
|
||||
|
||||
mkdir -p "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts
|
||||
cp -f ${pkgname}-${pkgver}/SysTray_X.json "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts/SysTray_X.json
|
||||
|
||||
mkdir -p "${pkgdir}"/usr/lib/thunderbird/distribution/extensions
|
||||
cp -f ${pkgname}-${pkgver}/systray-x@Ximi1970.xpi "${pkgdir}"/usr/lib//thunderbird/distribution/extensions/systray-x@Ximi1970.xpi
|
||||
}
|
||||
2
dist/deb/gnome/debian.control
vendored
2
dist/deb/gnome/debian.control
vendored
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, qt5-default, qtbase5-dev, qdbus-qt5,
|
||||
|
||||
Package: systray-x-gnome
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, gnome-shell-extension-appindicator, thunderbird (>= 1:68), thunderbird (<= 1:83)
|
||||
Depends: ${shlibs:Depends}, gnome-shell-extension-appindicator, thunderbird (>= 1:68), thunderbird (<= 1:84)
|
||||
Description: SysTray-X is a system tray extension for Thunderbird 68+.
|
||||
This version is optimized for the GNOME desktop.
|
||||
The add-on uses the WebExtension API's to control an external system
|
||||
|
||||
2
dist/deb/kde/debian.control
vendored
2
dist/deb/kde/debian.control
vendored
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, qt5-default, qtbase5-dev, qdbus-qt5,
|
||||
|
||||
Package: systray-x
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:83)
|
||||
Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:84)
|
||||
Description: SysTray-X is a system tray extension for Thunderbird 68+.
|
||||
This version is optimized for the KDE desktop.
|
||||
The add-on uses the WebExtension API's to control an external system
|
||||
|
||||
2
dist/deb/minimal/debian.control
vendored
2
dist/deb/minimal/debian.control
vendored
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, qt5-default, qtbase5-dev, qdbus-qt5,
|
||||
|
||||
Package: systray-x-minimal
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:83)
|
||||
Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:84)
|
||||
Description: SysTray-X is a system tray extension for Thunderbird 68+.
|
||||
This version is for non-KDE and non-GNOME desktops.
|
||||
The add-on uses the WebExtension API's to control an external system
|
||||
|
||||
2
dist/rpm/gnome/_service
vendored
2
dist/rpm/gnome/_service
vendored
@@ -14,6 +14,8 @@
|
||||
<param name="extract">dist/deb/gnome/debian.rules</param>
|
||||
<param name="extract">dist/deb/gnome/debian.postinst</param>
|
||||
<param name="extract">dist/deb/gnome/systray-x-gnome.dsc</param>
|
||||
<param name="extract">dist/arch/gnome/PKGBUILD</param>
|
||||
<param name="extract">dist/arch/gnome/systray-x-gnome.install</param>
|
||||
</service>
|
||||
<service mode="buildtime" name="tar" />
|
||||
<service mode="buildtime" name="recompress">
|
||||
|
||||
4
dist/rpm/gnome/systray-x-gnome.spec
vendored
4
dist/rpm/gnome/systray-x-gnome.spec
vendored
@@ -33,10 +33,10 @@ BuildRequires: pkgconfig(x11)
|
||||
Requires: gnome-shell-extension-appindicator
|
||||
%if 0%{?fedora_version}
|
||||
Requires: thunderbird >= 68
|
||||
Requires: thunderbird <= 83
|
||||
Requires: thunderbird <= 84
|
||||
%else
|
||||
Requires: MozillaThunderbird >= 68
|
||||
Requires: MozillaThunderbird <= 83
|
||||
Requires: MozillaThunderbird <= 84
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
||||
1
dist/rpm/kde/_service
vendored
1
dist/rpm/kde/_service
vendored
@@ -12,6 +12,7 @@
|
||||
<param name="extract">dist/deb/kde/debian.control</param>
|
||||
<param name="extract">dist/deb/kde/debian.rules</param>
|
||||
<param name="extract">dist/deb/kde/systray-x.dsc</param>
|
||||
<param name="extract">dist/arch/kde/PKGBUILD</param>
|
||||
</service>
|
||||
<service mode="buildtime" name="tar" />
|
||||
<service mode="buildtime" name="recompress">
|
||||
|
||||
4
dist/rpm/kde/systray-x.spec
vendored
4
dist/rpm/kde/systray-x.spec
vendored
@@ -34,12 +34,12 @@ BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: kf5-knotifications-devel
|
||||
Requires: kf5-knotifications
|
||||
Requires: thunderbird >= 68
|
||||
Requires: thunderbird <= 83
|
||||
Requires: thunderbird <= 84
|
||||
%else
|
||||
BuildRequires: knotifications-devel
|
||||
Requires: libKF5Notifications5
|
||||
Requires: MozillaThunderbird >= 68
|
||||
Requires: MozillaThunderbird <= 83
|
||||
Requires: MozillaThunderbird <= 84
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
||||
17
dist/rpm/minimal/_service
vendored
17
dist/rpm/minimal/_service
vendored
@@ -5,15 +5,16 @@
|
||||
<param name="revision">0.5.0</param>
|
||||
<param name="versionformat">0.5.0</param>
|
||||
<param name="filename">systray-x-minimal</param>
|
||||
<param name="extract">dist/rpm/gnome/systray-x-minimal.changes</param>
|
||||
<param name="extract">dist/rpm/gnome/systray-x-minimal.spec</param>
|
||||
<param name="extract">dist/rpm/minimal/systray-x-minimal.changes</param>
|
||||
<param name="extract">dist/rpm/minimal/systray-x-minimal.spec</param>
|
||||
<param name="extract">dist/rpm/VERSION</param>
|
||||
<param name="extract">dist/deb/gnome/debian.changelog</param>
|
||||
<param name="extract">dist/deb/gnome/debian.compat</param>
|
||||
<param name="extract">dist/deb/gnome/debian.control</param>
|
||||
<param name="extract">dist/deb/gnome/debian.rules</param>
|
||||
<param name="extract">dist/deb/gnome/debian.postinst</param>
|
||||
<param name="extract">dist/deb/gnome/systray-x-minimal.dsc</param>
|
||||
<param name="extract">dist/deb/minimal/debian.changelog</param>
|
||||
<param name="extract">dist/deb/minimal/debian.compat</param>
|
||||
<param name="extract">dist/deb/minimal/debian.control</param>
|
||||
<param name="extract">dist/deb/minimal/debian.rules</param>
|
||||
<param name="extract">dist/deb/minimal/debian.postinst</param>
|
||||
<param name="extract">dist/deb/minimal/systray-x-minimal.dsc</param>
|
||||
<param name="extract">dist/arch/minimal/PKGBUILD</param>
|
||||
</service>
|
||||
<service mode="buildtime" name="tar" />
|
||||
<service mode="buildtime" name="recompress">
|
||||
|
||||
4
dist/rpm/minimal/systray-x-minimal.spec
vendored
4
dist/rpm/minimal/systray-x-minimal.spec
vendored
@@ -32,10 +32,10 @@ BuildRequires: pkgconfig(Qt5DBus)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
%if 0%{?fedora_version}
|
||||
Requires: thunderbird >= 68
|
||||
Requires: thunderbird <= 83
|
||||
Requires: thunderbird <= 84
|
||||
%else
|
||||
Requires: MozillaThunderbird >= 68
|
||||
Requires: MozillaThunderbird <= 83
|
||||
Requires: MozillaThunderbird <= 84
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
||||
@@ -23,5 +23,14 @@ sed -i -e "s?\(^Depends:.*, thunderbird (<= 1:\).*?\1$VERSION)?" $SERVICE_FILE
|
||||
SERVICE_FILE="./dist/deb/minimal/debian.control"
|
||||
sed -i -e "s?\(^Depends:.*, thunderbird (<= 1:\).*?\1$VERSION)?" $SERVICE_FILE
|
||||
|
||||
SERVICE_FILE="./dist/arch/kde/PKGBUILD"
|
||||
sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION'?" $SERVICE_FILE
|
||||
|
||||
SERVICE_FILE="./dist/arch/gnome/PKGBUILD"
|
||||
sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION'?" $SERVICE_FILE
|
||||
|
||||
SERVICE_FILE="./dist/arch/minimal/PKGBUILD"
|
||||
sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION'?" $SERVICE_FILE
|
||||
|
||||
MANIFEST_FILE="./webext/manifest.json"
|
||||
sed -i -e "s?\(^.*\"strict_max_version\": \"\).*\(\.\*\"\)?\1$VERSION\2?" $MANIFEST_FILE
|
||||
|
||||
@@ -32,9 +32,6 @@ SysTrayX.Messaging = {
|
||||
// Send the browser info to app
|
||||
SysTrayX.Messaging.sendBrowserInfo();
|
||||
|
||||
// Send the window title to app
|
||||
SysTrayX.Messaging.sendTitle();
|
||||
|
||||
// Send version to app
|
||||
SysTrayX.Messaging.sendVersion();
|
||||
|
||||
@@ -256,11 +253,6 @@ SysTrayX.Messaging = {
|
||||
SysTrayX.Link.postSysTrayXMessage({ platformInfo: info });
|
||||
},
|
||||
|
||||
sendTitle: function () {
|
||||
const title = "-" + SysTrayX.Window.startWindow.title.split("-").pop();
|
||||
SysTrayX.Link.postSysTrayXMessage({ title: title });
|
||||
},
|
||||
|
||||
sendVersion: function () {
|
||||
SysTrayX.Link.postSysTrayXMessage({ version: SysTrayX.version });
|
||||
},
|
||||
@@ -274,8 +266,6 @@ SysTrayX.Messaging = {
|
||||
sendLocale: function () {
|
||||
const locale = browser.i18n.getUILanguage();
|
||||
|
||||
console.log("Locale: " + locale);
|
||||
|
||||
SysTrayX.Link.postSysTrayXMessage({
|
||||
locale: locale,
|
||||
});
|
||||
@@ -383,21 +373,6 @@ SysTrayX.Link = {
|
||||
},
|
||||
|
||||
receiveSysTrayXMessage: function (response) {
|
||||
if (response["window"]) {
|
||||
if (response["window"] === "minimized") {
|
||||
browser.windows.update(SysTrayX.Window.startWindow.id, {
|
||||
state: "minimized",
|
||||
});
|
||||
}
|
||||
|
||||
if (response["window"] === "normal") {
|
||||
browser.windows.update(SysTrayX.Window.startWindow.id, {
|
||||
state: "normal",
|
||||
focused: true,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (response["shutdown"]) {
|
||||
browser.windowEvent.onCloseButtonClick.removeListener(
|
||||
SysTrayX.Messaging.onCloseButton
|
||||
@@ -524,8 +499,6 @@ SysTrayX.Link = {
|
||||
};
|
||||
|
||||
SysTrayX.Window = {
|
||||
startWindow: undefined,
|
||||
|
||||
focusChanged: function (windowId) {
|
||||
browser.windows.getCurrent().then((win) => {
|
||||
SysTrayX.Link.postSysTrayXMessage({ window: win.state });
|
||||
@@ -606,10 +579,6 @@ async function start() {
|
||||
await getDefaultIcon();
|
||||
await getIcon();
|
||||
|
||||
SysTrayX.Window.startWindow = await browser.windows
|
||||
.getCurrent()
|
||||
.then((currentWindow) => currentWindow);
|
||||
|
||||
// Get all accounts
|
||||
SysTrayX.Messaging.accounts = await browser.accounts.list();
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"gecko": {
|
||||
"id": "systray-x@Ximi1970",
|
||||
"strict_min_version": "68.0",
|
||||
"strict_max_version": "83.*"
|
||||
"strict_max_version": "84.*"
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user