Merge branch 'master' of github.com:TurboWarp/packager

This commit is contained in:
Thomas Weber committed 2022-03-31 12:37:35 -05:00
commit 7ec153407c
5 files changed
+14 -14

No files matched your search

+4 -3
View File
@@ -11,7 +11,7 @@
import {progress, theme} from './stores';
import {isSupported, isSafari, isStandalone} from './environment';
import version from '../build/version-loader!';
import {LONG_NAME, FEEDBACK_PRIMARY, FEEDBACK_SECONDARY, ACCENT_COLOR, SOURCE_CODE, WEBSITE} from '../packager/brand';
import {APP_NAME, FEEDBACK_PRIMARY, FEEDBACK_SECONDARY, ACCENT_COLOR, SOURCE_CODE, WEBSITE} from '../packager/brand';
let projectData;
@@ -26,8 +26,9 @@
let modalVisible = false;
const defaultTitle = document.title;
let title = '';
$: document.title = projectData && title ? `${title} - ${LONG_NAME}` : LONG_NAME;
$: document.title = projectData && title ? `${title} - ${APP_NAME}` : defaultTitle;
const getPackagerOptionsComponent = () => import(
/* webpackChunkName: "packager-options-ui" */
@@ -114,7 +115,7 @@
<main aria-hidden={modalVisible} class:is-not-safari={!isSafari}>
<Section accent={ACCENT_COLOR}>
<div>
<h1>{LONG_NAME}</h1>
<h1>{APP_NAME}</h1>
{#if version}
<p><i>{version}</i> - <a href={WEBSITE}>Online version</a></p>
{/if}
+3 -3
View File
@@ -3,9 +3,9 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<% const {LONG_NAME, WEBSITE} = require('../packager/brand.js'); %>
<title><%= LONG_NAME %></title>
<meta name="description" content="Converts Scratch projects into HTML files, zip archives, or executable programs for Windows, macOS, and Linux.">
<% const {APP_NAME} = require('../packager/brand.js'); %>
<title><%= APP_NAME %> - Convert Scratch projects to HTML, EXE, and more</title>
<meta name="description" content="Converts Scratch 3, 2, or 1 projects into HTML files, zip archives, or executable programs for Windows, macOS, and Linux.">
<style>
body[p4-splash-theme="dark"]:not([p4-loaded]) {
background-color: #111;
+1 -4
View File
@@ -8,8 +8,6 @@ These values control branding strings throughout the entire app. If you're forki
APP_NAME is the name of the app. This text is included in packaged projects.
LONG_NAME a longer form of the app's name. Used by the website. Can just be the same as APP_NAME
WEBSITE is your app's website. This link is included in packaged projects.
COPYRIGHT_NOTICE is A copyright notice regarding the app. This text is included in packaged projects.
@@ -27,9 +25,8 @@ name is how they will be labelled in the interface and link is of course a URL
module.exports = {
APP_NAME: 'TurboWarp Packager',
LONG_NAME: 'TurboWarp Packager for Scratch',
WEBSITE: 'https://packager.turbowarp.org/',
COPYRIGHT_NOTICE: `Copyright (C) 2021 Thomas Weber
COPYRIGHT_NOTICE: `Copyright (C) 2021-2022 Thomas Weber
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License version 3