chore: use TiddlyGit as name and Tiddlywiki Icon as new icon

This commit is contained in:
tiddlygit-test 2020-07-19 15:26:56 +08:00
parent 460e67f4f7
commit ebb7105ce4
29 changed files with 85 additions and 63 deletions

View file

@ -2,7 +2,7 @@
| macOS | Linux | Windows |
| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [![GitHub Actions macOS Build Status](https://github.com/atomery/singlebox/workflows/macOS/badge.svg)](https://github.com/atomery/singlebox/actions?query=workflow%3AmacOS) | [![GitHub Actions Linux Build Status](https://github.com/atomery/singlebox/workflows/Linux/badge.svg)](https://github.com/atomery/singlebox/actions?query=workflow%3ALinux) | [![GitHub Actions Windows Build Status](https://github.com/atomery/singlebox/workflows/Windows/badge.svg)](https://github.com/atomery/singlebox/actions?query=workflow%3AWindows) |
| [![GitHub Actions macOS Build Status](https://github.com/tiddly-gittly/tiddlygit-desktop/workflows/macOS/badge.svg)](https://github.com/tiddly-gittly/tiddlygit-desktop/actions?query=workflow%3AmacOS) | [![GitHub Actions Linux Build Status](https://github.com/tiddly-gittly/tiddlygit-desktop/workflows/Linux/badge.svg)](https://github.com/tiddly-gittly/tiddlygit-desktop/actions?query=workflow%3ALinux) | [![GitHub Actions Windows Build Status](https://github.com/tiddly-gittly/tiddlygit-desktop/workflows/Windows/badge.svg)](https://github.com/tiddly-gittly/tiddlygit-desktop/actions?query=workflow%3AWindows) |
**TiddlyGit** - Customizable personal knowledge-base with Github as unlimited storage and blogging platform.
@ -10,8 +10,6 @@
TiddlyGit is a cross-platform desktop app that make [nodejs-TiddlyWiki](https://github.com/Jermolene/TiddlyWiki5#installing-tiddlywiki-on-nodejs) easy to access.
The desktop app shell is based on [https://github.com/atomery/singlebox](atomery/singlebox) and [atomery/webcatalog](https://github.com/atomery/webcatalog), they provide lots of utils around website-generated-app, much powerful than generating app from website simply using Chrome.
### Why Github?
Because Github is one of the best free civil [BaaS](https://www.alibabacloud.com/blog/backend-as-a-service-baas-for-efficient-software-development_519851):
@ -61,3 +59,9 @@ npm run dist
```
</details>
## Credits
The desktop app shell is based on [https://github.com/atomery/singlebox](atomery/singlebox) and [atomery/webcatalog](https://github.com/atomery/webcatalog), they provide lots of utils around website-generated-app, much powerful than generating app from website simply using Chrome. Also the independent developer @quanglam2807 behind these great tools helps me a lot when I develop TiddlyGit.
Current Icon is download from [iconsdb](https://www.iconsdb.com/custom-color/github-11-icon.html) under Creative Commons Attribution-NoDerivs 3.0 , if you are a designer, please feel free to contribute your ICON if you have a better idea.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 KiB

After

Width:  |  Height:  |  Size: 1.4 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before After
Before After

View file

@ -1,28 +1,28 @@
# add registry to define Singlebox as browser and mail client on Windows 10+
# add registry to define TiddlyGit as browser and mail client on Windows 10+
# rewritten in NSH from https://github.com/minbrowser/min/blob/master/main/registryConfig.js
# fix https://github.com/atomery/webcatalog/issues/784
# useful doc https://github.com/electron-userland/electron-builder/issues/837#issuecomment-614127460
# useful doc https://www.electron.build/configuration/nsis#custom-nsis-script
!macro customInstall
WriteRegStr HKCU 'Software\RegisteredApplications' 'Singlebox' 'Software\Clients\StartMenuInternet\Singlebox\Capabilities'
WriteRegStr HKCU 'Software\Classes\Singlebox' '' 'Singlebox Browser Document'
WriteRegStr HKCU 'Software\Classes\Singlebox\Application' 'ApplicationIcon' '$appExe,0'
WriteRegStr HKCU 'Software\Classes\Singlebox\Application' 'ApplicationName' 'Singlebox'
WriteRegStr HKCU 'Software\Classes\Singlebox\Application' 'AppUserModelId' 'Singlebox'
WriteRegStr HKCU 'Software\Classes\Singlebox\DefaulIcon' 'ApplicationIcon' '$appExe,0'
WriteRegStr HKCU 'Software\Classes\Singlebox\shell\open\command' '' '"$appExe" "%1"'
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\Capabilities\StartMenu' 'StartMenuInternet' 'Singlebox'
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\Capabilities\URLAssociations' 'http' 'Singlebox'
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\Capabilities\URLAssociations' 'https' 'Singlebox'
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\Capabilities\URLAssociations' 'mailto' 'Singlebox'
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\DefaultIcon' '' '$appExe,0'
WriteRegDWORD HKCU 'Software\Clients\StartMenuInternet\Singlebox\InstallInfo' 'IconsVisible' 1
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\shell\open\command' '' '$appExe'
WriteRegStr HKCU 'Software\RegisteredApplications' 'TiddlyGit' 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities'
WriteRegStr HKCU 'Software\Classes\TiddlyGit' '' 'TiddlyGit Browser Document'
WriteRegStr HKCU 'Software\Classes\TiddlyGit\Application' 'ApplicationIcon' '$appExe,0'
WriteRegStr HKCU 'Software\Classes\TiddlyGit\Application' 'ApplicationName' 'TiddlyGit'
WriteRegStr HKCU 'Software\Classes\TiddlyGit\Application' 'AppUserModelId' 'TiddlyGit'
WriteRegStr HKCU 'Software\Classes\TiddlyGit\DefaulIcon' 'ApplicationIcon' '$appExe,0'
WriteRegStr HKCU 'Software\Classes\TiddlyGit\shell\open\command' '' '"$appExe" "%1"'
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\StartMenu' 'StartMenuInternet' 'TiddlyGit'
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\URLAssociations' 'http' 'TiddlyGit'
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\URLAssociations' 'https' 'TiddlyGit'
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\URLAssociations' 'mailto' 'TiddlyGit'
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\DefaultIcon' '' '$appExe,0'
WriteRegDWORD HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\InstallInfo' 'IconsVisible' 1
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\shell\open\command' '' '$appExe'
!macroend
!macro customUnInstall
DeleteRegValue HKCU 'Software\RegisteredApplications' 'Singlebox'
DeleteRegKey HKCU 'Software\Classes\Singlebox'
DeleteRegKey HKCU 'Software\Clients\StartMenuInternet\Singlebox'
DeleteRegValue HKCU 'Software\RegisteredApplications' 'TiddlyGit'
DeleteRegKey HKCU 'Software\Classes\TiddlyGit'
DeleteRegKey HKCU 'Software\Clients\StartMenuInternet\TiddlyGit'
!macroend

View file

@ -55,8 +55,8 @@ switch (process.platform) {
const options = {
targets,
config: {
appId: 'com.singlebox.app',
productName: 'Singlebox',
appId: 'com.tiddlygit.app',
productName: 'TiddlyGit',
asar: true,
files: ['!tests/**/*', '!docs/**/*', '!template/**/*'],
extraFiles: [
@ -128,7 +128,7 @@ const options = {
const appPath = `${appOutDir}/${appName}.app`;
return notarize({
appBundleId: 'com.singlebox.app',
appBundleId: 'com.tiddlygit.app',
appPath,
appleId: process.env.APPLE_ID,
appleIdPassword: process.env.APPLE_ID_PASSWORD,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Before After
Before After

View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Singlebox</title>
<title>TiddlyGit</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
</head>

View file

@ -333,16 +333,16 @@ function createMenu() {
role: 'help',
submenu: [
{
label: 'Singlebox Support',
click: () => shell.openExternal('https://atomery.com/support?app=singlebox'),
label: 'TiddlyGit Support',
click: () => shell.openExternal('https://atomery.com/support?app=tiddlygit'),
},
{
label: 'Report a Bug via GitHub...',
click: () => shell.openExternal('https://github.com/atomery/singlebox/issues'),
click: () => shell.openExternal('https://github.com/tiddly-gittly/tiddlygit-desktop/issues'),
},
{
label: 'Request a New Feature via GitHub...',
click: () => shell.openExternal('https://github.com/atomery/singlebox/issues/new?template=feature.md&title=feature%3A+'),
click: () => shell.openExternal('https://github.com/tiddly-gittly/tiddlygit-desktop/issues/new?template=feature.md&title=feature%3A+'),
},
{
label: 'Submit New App to Catalog...',
@ -350,7 +350,7 @@ function createMenu() {
},
{
label: 'Learn More...',
click: () => shell.openExternal('https://singleboxapp.com'),
click: () => shell.openExternal('https://tiddlygitapp.com'),
},
],
},
@ -377,10 +377,10 @@ function createMenu() {
if (process.platform === 'darwin') {
template.unshift({
label: 'Singlebox',
label: 'TiddlyGit',
submenu: [
{
label: 'About Singlebox',
label: 'About TiddlyGit',
click: () => aboutWindow.show(),
},
{ type: 'separator' },

Binary file not shown.

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 641 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After

View file

@ -104,12 +104,12 @@ remote.getCurrentWebContents().on('context-menu', (e, info) => {
},
{ type: 'separator' },
{
label: 'Singlebox Support',
click: () => shell.openExternal('https://atomery.com/support?app=singlebox'),
label: 'TiddlyGit Support',
click: () => shell.openExternal('https://github.com/tiddly-gittly/TiddlyGit-Desktop/issues/new/choose'),
},
{
label: 'Singlebox Website',
click: () => shell.openExternal('https://singleboxapp.com'),
label: 'TiddlyGit Website',
click: () => shell.openExternal('https://github.com/tiddly-gittly/TiddlyGit-Desktop'),
},
{ type: 'separator' },
{

View file

@ -176,12 +176,12 @@ const handleLoaded = (event) => {
},
{ type: 'separator' },
{
label: 'Singlebox Support',
click: () => shell.openExternal('https://atomery.com/support?app=singlebox'),
label: 'TiddlyGit Support',
click: () => shell.openExternal('https://github.com/tiddly-gittly/TiddlyGit-Desktop/issues/new/choose'),
},
{
label: 'Singlebox Website',
click: () => shell.openExternal('https://singleboxapp.com'),
label: 'TiddlyGit Website',
click: () => shell.openExternal('https://github.com/tiddly-gittly/TiddlyGit-Desktop'),
},
{ type: 'separator' },
{

View file

@ -45,7 +45,7 @@ const createAsync = () => new Promise((resolve) => {
index: REACT_PATH,
tray,
preloadWindow: true,
tooltip: 'Singlebox',
tooltip: 'TiddlyGit',
browserWindow: {
x: menubarWindowState.x,
y: menubarWindowState.y,
@ -99,14 +99,14 @@ const createAsync = () => new Promise((resolve) => {
const contextMenu = Menu.buildFromTemplate([
{
label: 'Open Singlebox',
label: 'Open TiddlyGit',
click: () => mb.showWindow(),
},
{
type: 'separator',
},
{
label: 'About Singlebox',
label: 'About TiddlyGit',
click: () => ipcMain.emit('request-show-about-window'),
},
{ type: 'separator' },
@ -164,7 +164,7 @@ const createAsync = () => new Promise((resolve) => {
height: mainWindowState.height,
minHeight: 100,
minWidth: 350,
title: 'Singlebox',
title: 'TiddlyGit',
titleBarStyle: 'hidden',
show: false,
// manually set dock icon for AppImage

View file

@ -60,8 +60,8 @@ const About = (props) => {
return (
<div>
<DialogContent className={classes.dialogContent}>
<img src={`file://${window.iconPath}`} alt="Singlebox" className={classes.icon} />
<Typography variant="h6" className={classes.title}>Singlebox</Typography>
<img src={`file://${window.iconPath}`} alt="TiddlyGit" className={classes.icon} />
<Typography variant="h6" className={classes.title}>TiddlyGit</Typography>
<Typography
variant="body2"
className={classes.version}
@ -81,13 +81,13 @@ const About = (props) => {
<Button
onClick={() => requestOpenInBrowser('https://singleboxapp.com?utm_source=singlebox_app')}
onClick={() => requestOpenInBrowser('https://github.com/tiddly-gittly/TiddlyGit-Desktop')}
>
Website
</Button>
<br />
<Button
onClick={() => requestOpenInBrowser('https://atomery.com/support?app=singlebox&utm_source=singlebox_app')}
onClick={() => requestOpenInBrowser('https://github.com/tiddly-gittly/TiddlyGit-Desktop/issues/new/choose')}
>
Support
</Button>
@ -97,10 +97,23 @@ const About = (props) => {
<span role="img" aria-label="love"></span>
<span> by </span>
<span
onClick={() => requestOpenInBrowser('https://atomery.com?utm_source=singlebox_app')}
onClick={() => requestOpenInBrowser('https://onetwo.ren/wiki/')}
onKeyDown={(e) => {
if (e.key !== 'Enter') return;
requestOpenInBrowser('https://atomery.com?utm_source=singlebox_app');
requestOpenInBrowser('https://onetwo.ren/wiki/');
}}
role="link"
tabIndex="0"
className={classes.link}
>
Lin Onetwo
</span>
<span> and </span>
<span
onClick={() => requestOpenInBrowser('https://atomery.com?utm_source=tiddlygit')}
onKeyDown={(e) => {
if (e.key !== 'Enter') return;
requestOpenInBrowser('https://atomery.com?utm_source=tiddlygit');
}}
role="link"
tabIndex="0"

View file

@ -764,7 +764,7 @@ const Preferences = ({
<span>If notifications don&apos;t show up,</span>
<span> make sure you enable notifications in </span>
<b>
<span>macOS Preferences &gt; Notifications &gt; Singlebox</span>
<span>macOS Preferences &gt; Notifications &gt; TiddlyGit</span>
</b>
<span>.</span>
</>
@ -780,7 +780,7 @@ const Preferences = ({
<ListItemText
secondary={(
<>
<span>WebCatalog supports notifications out of the box. </span>
<span>TiddlyGit supports notifications out of the box. </span>
<span>But for some web apps, to receive notifications, </span>
<span>you will need to manually configure additional </span>
<span>web app settings. </span>
@ -1208,12 +1208,12 @@ const Preferences = ({
<ChevronRightIcon color="action" />
</ListItem>
<Divider />
<ListItem button onClick={() => requestOpenInBrowser('https://singleboxapp.com?utm_source=singlebox_app')}>
<ListItem button onClick={() => requestOpenInBrowser('https://tiddlygitapp.com?utm_source=tiddlygit_app')}>
<ListItemText primary="Website" />
<ChevronRightIcon color="action" />
</ListItem>
<Divider />
<ListItem button onClick={() => requestOpenInBrowser('https://atomery.com/support?app=singlebox&utm_source=singlebox_app')}>
<ListItem button onClick={() => requestOpenInBrowser('https://atomery.com/support?app=tiddlygit&utm_source=tiddlygit_app')}>
<ListItemText primary="Support" />
<ChevronRightIcon color="action" />
</ListItem>

View file

@ -26,7 +26,7 @@ const ListItemDefaultBrowser = () => {
const userChoicePath = `HKCU\\SOFTWARE\\Microsoft\\Windows\\Shell\\Associations\\URLAssociations\\${protocolName}\\UserChoice`;
window.require('electron').remote.require('regedit').list([userChoicePath], (err, result) => {
try {
setIsDefault(!err && result[userChoicePath].values.ProgId.value === 'Singlebox');
setIsDefault(!err && result[userChoicePath].values.ProgId.value === 'TiddlyGit');
} catch (tryErr) {
// eslint-disable-next-line no-console
console.log(tryErr);
@ -55,13 +55,13 @@ const ListItemDefaultBrowser = () => {
if (isDefault) {
return (
<ListItem>
<ListItemText secondary="Singlebox is your default browser." />
<ListItemText secondary="TiddlyGit is your default browser." />
</ListItem>
);
}
const sharedListItemText = (
<ListItemText primary="Default browser" secondary="Make Singlebox the default browser." />
<ListItemText primary="Default browser" secondary="Make TiddlyGit the default browser." />
);
// open ms-settings on Windows 10

View file

@ -26,7 +26,7 @@ const ListItemDefaultMailClient = () => {
const userChoicePath = `HKCU\\SOFTWARE\\Microsoft\\Windows\\Shell\\Associations\\URLAssociations\\${protocolName}\\UserChoice`;
window.require('electron').remote.require('regedit').list([userChoicePath], (err, result) => {
try {
setIsDefault(!err && result[userChoicePath].values.ProgId.value === 'Singlebox');
setIsDefault(!err && result[userChoicePath].values.ProgId.value === 'TiddlyGit');
} catch (tryErr) {
// eslint-disable-next-line no-console
console.log(tryErr);
@ -55,7 +55,7 @@ const ListItemDefaultMailClient = () => {
if (isDefault) {
return (
<ListItem>
<ListItemText secondary="Singlebox is your default email client." />
<ListItemText secondary="TiddlyGit is your default email client." />
</ListItem>
);
}
@ -66,7 +66,7 @@ const ListItemDefaultMailClient = () => {
return (
// https://docs.microsoft.com/en-us/windows/uwp/launch-resume/launch-settings-app
<ListItem button onClick={() => requestOpenInBrowser('ms-settings:defaultapps')}>
<ListItemText primary="Default email client" secondary="Make Singlebox the default email client." />
<ListItemText primary="Default email client" secondary="Make TiddlyGit the default email client." />
<ChevronRightIcon color="action" />
</ListItem>
);
@ -74,7 +74,7 @@ const ListItemDefaultMailClient = () => {
return (
<ListItem>
<ListItemText primary="Default email client" secondary="Make Singlebox the default email client." />
<ListItemText primary="Default email client" secondary="Make TiddlyGit the default email client." />
<Button
variant="outlined"
size="small"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

View file

@ -104,7 +104,7 @@ const runApp = () => {
store.dispatch(initDialogSpellcheckLanguages());
document.title = 'Preferred Spell Checking Languages';
} else {
document.title = 'Singlebox';
document.title = 'TiddlyGit';
}
if (window.mode !== 'main' && window.mode !== 'menubar') {

View file

@ -37,7 +37,7 @@ export const register = () => (dispatch, getState) => {
requestSetPreference('registered', true);
requestShowMessageBox('Registration Complete! Thank you for supporting the future development of Singlebox.');
requestShowMessageBox('Registration Complete! Thank you for supporting the future development of TiddlyGit.');
const { remote } = window.require('electron');
remote.getCurrentWindow().close();

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1,5 @@
created: 20200605110941507
modified: 20200605110941507
title: TiddlyWikiIconBlue.png
tmap.id: 28ce327f-4a26-4eba-94b6-4151e5906b9c
type: image/png