Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d5a136dff | ||
|
|
580827f7ca | ||
|
|
6f33c7277a |
@@ -3,5 +3,7 @@
|
|||||||
"name": "threadnet-desktop",
|
"name": "threadnet-desktop",
|
||||||
"productName": "ThreadNet",
|
"productName": "ThreadNet",
|
||||||
"description": "ThreadNet — powered by Element",
|
"description": "ThreadNet — powered by Element",
|
||||||
"protocols": ["io.element.desktop", "element"]
|
"protocols": ["io.element.desktop", "element"],
|
||||||
|
"mac.icon": "build/icon.icns",
|
||||||
|
"dmg.badgeIcon": "build/icon.icns"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
{
|
{
|
||||||
"brand": "aXion1337.Chat",
|
"brand": "aXion1337.Chat",
|
||||||
|
"branding": {
|
||||||
|
"auth_header_logo_url": "vector-icons/512.png",
|
||||||
|
"logo_link_url": "https://axion1337.chat"
|
||||||
|
},
|
||||||
"default_server_config": {
|
"default_server_config": {
|
||||||
"m.homeserver": {
|
"m.homeserver": {
|
||||||
"base_url": "https://matrix.axion1337.chat",
|
"base_url": "https://matrix.axion1337.chat",
|
||||||
|
|||||||
@@ -48,6 +48,8 @@ interface Variant extends Metadata {
|
|||||||
"appId": string;
|
"appId": string;
|
||||||
"linux.executableName"?: string;
|
"linux.executableName"?: string;
|
||||||
"linux.deb.name"?: string;
|
"linux.deb.name"?: string;
|
||||||
|
"mac.icon"?: string;
|
||||||
|
"dmg.badgeIcon"?: string;
|
||||||
"protocols": string[];
|
"protocols": string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -202,6 +204,31 @@ if (variant["linux.deb.name"]) {
|
|||||||
config.deb.fpm.push("--name", variant["linux.deb.name"]);
|
config.deb.fpm.push("--name", variant["linux.deb.name"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ThreadNet-Fork: Icon-Pfade fuer macOS ueberschreibbar machen.
|
||||||
|
*
|
||||||
|
* Upstream setzt `mac.icon` auf das Icon-Composer-Bundle `build/icon.icon`
|
||||||
|
* (macOS 26). Dessen Verarbeitung ruft `actool` auf, das es nur mit dem vollen
|
||||||
|
* Xcode gibt (~10 GB, App-Store-Login) - mit blossen CommandLineTools scheitert
|
||||||
|
* damit JEDER macOS-Build, nicht nur das DMG:
|
||||||
|
*
|
||||||
|
* ⨯ Failed to check actool version. Is Xcode 26 or higher installed?
|
||||||
|
*
|
||||||
|
* Ueber die Variante laesst sich stattdessen das klassische `.icns` waehlen.
|
||||||
|
* Bewusst hier als Variantenoption statt als Aenderung an den Defaults oben:
|
||||||
|
* So bleibt Upstreams Wert unberuehrt und ein Upstream-Merge erzeugt keinen
|
||||||
|
* Konflikt an dieser Zeile.
|
||||||
|
*
|
||||||
|
* Preis: kein macOS-26-Icon-Rendering. Ohne Xcode gaebe es ohnehin keinen Build.
|
||||||
|
*/
|
||||||
|
if (variant["mac.icon"]) {
|
||||||
|
config.mac.icon = variant["mac.icon"];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (variant["dmg.badgeIcon"]) {
|
||||||
|
config.dmg.badgeIcon = variant["dmg.badgeIcon"];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allow specifying windows signing cert via env vars
|
* Allow specifying windows signing cert via env vars
|
||||||
* @param {string} process.env.ED_SIGNTOOL_SUBJECT_NAME
|
* @param {string} process.env.ED_SIGNTOOL_SUBJECT_NAME
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 590 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 596 KiB |
@@ -20,7 +20,11 @@ export const DEFAULTS: DeepReadonly<IConfigOptions> = {
|
|||||||
branding: {
|
branding: {
|
||||||
logo_link_url: "https://element.io",
|
logo_link_url: "https://element.io",
|
||||||
auth_header_logo_url: "themes/element/img/logos/element-logo.svg",
|
auth_header_logo_url: "themes/element/img/logos/element-logo.svg",
|
||||||
welcome_background_url: "themes/element/img/backgrounds/lake.jpg",
|
// ThreadNet-Fork: eigenes Titelbild statt Elements lake.jpg. Steht hier im
|
||||||
|
// Default und nicht in element-values.yaml, weil die Bilddatei ohnehin nur
|
||||||
|
// ueber einen Build in den Container kommt - eine zusaetzliche Config-Zeile
|
||||||
|
// waere eine zweite Stelle, die mitwandern muesste.
|
||||||
|
welcome_background_url: "themes/element/img/backgrounds/alpenglow.jpg",
|
||||||
},
|
},
|
||||||
help_url: "https://element.io/help",
|
help_url: "https://element.io/help",
|
||||||
help_encryption_url: "https://element.io/help#encryption",
|
help_encryption_url: "https://element.io/help#encryption",
|
||||||
|
|||||||
@@ -106,34 +106,42 @@ export default class HelpUserSettingsTab extends React.Component<EmptyObject, IS
|
|||||||
<SettingsSubsection heading={_t("common|credits")}>
|
<SettingsSubsection heading={_t("common|credits")}>
|
||||||
<SettingsSubsectionText>
|
<SettingsSubsectionText>
|
||||||
<ul>
|
<ul>
|
||||||
|
{/* ThreadNet-Fork: eigenes Titelbild, deshalb eigene Danksagung.
|
||||||
|
Bewusst OHNE _t(): der Schluessel credits|default_cover_photo
|
||||||
|
steckt in 32 Sprachdateien, 31 davon nennen Elements Fotografen
|
||||||
|
namentlich. Wuerden wir nur en/de anpassen, stuende in 29
|
||||||
|
Sprachen eine falsche Attribution — und die uebrigen 29 koennen
|
||||||
|
wir nicht pflegen, sie kommen aus Elements Uebersetzungsdienst.
|
||||||
|
Ein Fotografenname und eine Lizenzbezeichnung werden ohnehin
|
||||||
|
nicht uebersetzt. Der ungenutzte Schluessel bleibt in den
|
||||||
|
Sprachdateien stehen — ihn aus 32 Dateien zu entfernen waere
|
||||||
|
Laerm im naechsten Upstream-Merge. */}
|
||||||
<li>
|
<li>
|
||||||
{_t(
|
The{" "}
|
||||||
"credits|default_cover_photo",
|
<ExternalLink
|
||||||
{},
|
href="themes/element/img/backgrounds/alpenglow.jpg"
|
||||||
{
|
rel="noreferrer noopener"
|
||||||
photo: (sub) => (
|
target="_blank"
|
||||||
<ExternalLink
|
>
|
||||||
href="themes/element/img/backgrounds/lake.jpg"
|
default cover photo
|
||||||
rel="noreferrer noopener"
|
</ExternalLink>{" "}
|
||||||
target="_blank"
|
is by <ExternalLink href="https://unsplash.com/@heytowner">John Towner</ExternalLink> on{" "}
|
||||||
>
|
<ExternalLink
|
||||||
{sub}
|
href="https://unsplash.com/photos/JgOeRuGD_Y4"
|
||||||
</ExternalLink>
|
rel="noreferrer noopener"
|
||||||
),
|
target="_blank"
|
||||||
author: (sub) => (
|
>
|
||||||
<ExternalLink href="https://www.flickr.com/golan">{sub}</ExternalLink>
|
Unsplash
|
||||||
),
|
</ExternalLink>
|
||||||
terms: (sub) => (
|
, used under the{" "}
|
||||||
<ExternalLink
|
<ExternalLink
|
||||||
href="https://creativecommons.org/licenses/by-sa/4.0/"
|
href="https://unsplash.com/license"
|
||||||
rel="noreferrer noopener"
|
rel="noreferrer noopener"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
>
|
>
|
||||||
{sub}
|
Unsplash License
|
||||||
</ExternalLink>
|
</ExternalLink>
|
||||||
),
|
.
|
||||||
},
|
|
||||||
)}
|
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
{_t(
|
{_t(
|
||||||
|
|||||||
Reference in New Issue
Block a user