Merge branch 'develop' into feature-fix-tb136

This commit is contained in:
Ximi1970
2025-03-06 20:59:53 +01:00
2 changed files with 39 additions and 9 deletions

View File

@@ -160,6 +160,42 @@ sudo zypper in systray-x-minimal
Installing the repository:
###### 24.10
Remove the Thunderbird snap package:
```bash
sudo apt remove thunderbird
```
Install the deb Thunderbird repository:
```bash
sudo add-apt-repository ppa:mozillateam/ppa
sudo nano /etc/apt/preferences.d/mozillateamppa
```
Insert this into the preferences file (it blocks the snap package):
```bash
Package: thunderbird*
Pin: release o=LP-PPA-mozillateam
Pin-Priority: 1001
```
Save the file.
Refresh the repositories and install the deb version of Thunderbird:
```bash
sudo apt update
sudo apt install thunderbird
```
Now install the SysTray-X repository:
```bash
wget -q https://download.opensuse.org/repositories/home:/Ximi1970/xUbuntu_24.10/Release.key
sudo mv -f Release.key /etc/apt/trusted.gpg.d/Systray-x.Ximi1970.asc
sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_24.10 ./" > /etc/apt/sources.list.d/systray-x.list'
sudo apt update
```
###### 24.04 LTS
Remove the Thunderbird snap package:
@@ -241,15 +277,6 @@ sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi197
sudo apt update
```
###### 16.04 LTS
```bash
wget -q http://download.opensuse.org/repositories/home:/Ximi1970/xUbuntu_16.04/Release.key
sudo apt-key add Release.key
sudo bash -c 'echo "deb http://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_16.04 ./" > /etc/apt/sources.list.d/systray-x.list'
sudo apt update
```
#### Package
Installing the SysTray-X addon and companion app package:

View File

@@ -1079,6 +1079,9 @@ void SysTrayXLink::EncodePreferences( const Preferences& pref )
prefObject.insert( "startupDelay", QJsonValue::fromVariant( QString::number( pref.getStartupDelay() ) ) );
prefObject.insert( "apiCountMethod", QJsonValue::fromVariant( QString( pref.getApiCountMethod() ? "true" : "false" ) ) );
prefObject.insert( "newIndicatorType", QJsonValue::fromVariant( QString::number( pref.getNewIndicatorType() ) ) );
prefObject.insert( "newShadeColor", QJsonValue::fromVariant( QString( pref.getNewShadeColor() ) ) );
prefObject.insert( "startApp", QJsonValue::fromVariant( pref.getStartApp() ) );
prefObject.insert( "startAppArgs", QJsonValue::fromVariant( pref.getStartAppArgs() ) );
prefObject.insert( "closeApp", QJsonValue::fromVariant( pref.getCloseApp() ) );