diff --git a/CHANGELOG.md b/CHANGELOG.md index c7d7c0c..336ee72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,20 @@ but can still easily be enabled by following instructions in the [docs](README.m ### v0.6.1 (wip) -- new: semi-mac support? installs, but can't confirm changes have taken effect. +- new: mac support (identical functionality to others platforms with the + exception of the native minimise/maximise/close buttons being kept, as they integrate + better with the OS while not being out-of-place in notion). +- improved: replaced button symbols with svgs for multi-platform support. +- improved: window close button is now red on hover (thanks to [@torchatlas](https://github.com/torchatlas)). - bugfix: `cleaner.py` patched for linux. +- bugfix: tray now operates as expected on linux. - bugfix: odd mix of `\\` and `/` being used for windows filepaths. - bugfix: app no longer crashes when sidebar is toggled. +known remaining/confirmed issues: + +- russian symbols not supported by UTF-8 + ### v0.6.0 (2020-06-30) - style: custom fonts. diff --git a/README.md b/README.md index b13725c..6ad6541 100644 --- a/README.md +++ b/README.md @@ -65,13 +65,9 @@ experienced problems with the notion app, or just want to add something a bit mo default windows titlebar/frame has been replaced by one more fitting to the theme of the app. this includes the addition of an extra button, "always on top" -symbolised with an arrow (4th from the right). when toggled to point up, +symbolised with an arrow. when toggled to point up, notion will remain the top visible window even if not focused. -to customise which characters are used for these buttons, open in the `resources/preload.js` file, -find the relevant button icon (lines 69 - 82) and replace it with your chosen unicode character (e.g. -replacing `return '⨉';` with `return '🙄';`). - ### nicer scrollbars i mean, yeah. get rid of those ugly default scrollbars and use nice inconspicuous diff --git a/customiser.py b/customiser.py index dead398..100f58a 100755 --- a/customiser.py +++ b/customiser.py @@ -118,7 +118,7 @@ try: f' ...linking to {os.path.join(".", "resources", "user.css")}') with open(os.path.join(__dirname__, 'resources', 'preload.js'), 'r', encoding='UTF-8') as insert: append.write(insert.read().replace( - '☃☃☃assets☃☃☃', os.path.join(enhancer_folder, 'resources').replace('\\', '/'))) + '☃☃☃resources☃☃☃', os.path.join(enhancer_folder, 'resources').replace('\\', '/'))) else: print( f' * {os.path.join(filepath, "app","renderer","preload.js")} was not found: step skipped.') @@ -192,11 +192,9 @@ try: with open(os.path.join(filepath, "app", "main", "main.js"), 'a', encoding='UTF-8') as append: with open(os.path.join(__dirname__, 'resources', 'tray.js'), 'r', encoding='UTF-8') as insert: append.write('\n' + insert.read().replace( - '☃☃☃hotkey☃☃☃', hotkey)) - print( - f' ...copying tray icon {os.path.join(".", "logo.png")} to {os.path.join(filepath, "app", "main")}') - copyfile(os.path.join(__dirname__, 'logo.png'), - os.path.join(filepath, "app", "main", "logo.png")) + '☃☃☃hotkey☃☃☃', hotkey).replace( + '☃☃☃resources☃☃☃', os.path.join(enhancer_folder, 'resources').replace('\\', '/')) + ) print( f' ...copying datastore wrapper {os.path.join(".", "resources", "store.js")} to {os.path.join(filepath, "app")}') copyfile(os.path.join(__dirname__, 'resources', 'store.js'), diff --git a/docs.json b/docs.json index 7d4288c..f101b7e 100644 --- a/docs.json +++ b/docs.json @@ -8,7 +8,7 @@ "url": "https://dragonwocky.me/notion-enhancer/" }, "icon": { - "light": "logo.png" + "light": "notion.png" }, "overwrite": true, "exclude": [ diff --git a/docs/changelog.html b/docs/changelog.html index 5094605..aed0bc2 100644 --- a/docs/changelog.html +++ b/docs/changelog.html @@ -1,4 +1,4 @@ -changelog | notion enhancer

notion enhancer

+changelog | notion enhancer

notion enhancer

@@ -13,10 +13,19 @@ but can still easily be enabled by following instructions in the v0.6.1 (wip)

    -
  • new: semi-mac support? installs, but can't confirm changes have taken effect.
    • +
  • new: mac support (identical functionality to others platforms with the +exception of the native minimise/maximise/close buttons being kept, as they integrate +better with the OS while not being out-of-place in notion).
    • +
  • improved: replaced button symbols with svgs for multi-platform support.
    • +
  • improved: window close button is now red on hover (thanks to @torchatlas).
  • bugfix: cleaner.py patched for linux.
    • +
  • bugfix: tray now operates as expected on linux.
  • bugfix: odd mix of \\ and / being used for windows filepaths.
  • bugfix: app no longer crashes when sidebar is toggled.
    • +
+

known remaining/confirmed issues:

+
    +
  • russian symbols not supported by UTF-8
diff --git a/docs/index.html b/docs/index.html index ba93e40..6740e37 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,4 +1,4 @@ -notion enhancer

notion enhancer

+notion enhancer

notion enhancer

@@ -70,11 +70,8 @@ additionally, if you ever need to change or reset your notion build, the c

default windows titlebar/frame has been replaced by one more fitting to the theme of the app.

this includes the addition of an extra button, "always on top" -symbolised with an arrow (4th from the right). when toggled to point up, +symbolised with an arrow. when toggled to point up, notion will remain the top visible window even if not focused.

-

to customise which characters are used for these buttons, open in the resources/preload.js file, -find the relevant button icon (lines 69 - 82) and replace it with your chosen unicode character (e.g. -replacing return '⨉'; with return '🙄';).

diff --git a/docs/logo.png b/docs/notion.png similarity index 100% rename from docs/logo.png rename to docs/notion.png diff --git a/docs/styling.html b/docs/styling.html index ef24b6e..94e0680 100644 --- a/docs/styling.html +++ b/docs/styling.html @@ -1,4 +1,4 @@ -styling | notion enhancer

notion enhancer

+styling | notion enhancer

notion enhancer

diff --git a/logo.png b/notion.png similarity index 100% rename from logo.png rename to notion.png diff --git a/resources/icons/alwaysontop_off.svg b/resources/icons/alwaysontop_off.svg new file mode 100644 index 0000000..592e011 --- /dev/null +++ b/resources/icons/alwaysontop_off.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/alwaysontop_on.svg b/resources/icons/alwaysontop_on.svg new file mode 100644 index 0000000..56afa32 --- /dev/null +++ b/resources/icons/alwaysontop_on.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/close.svg b/resources/icons/close.svg new file mode 100644 index 0000000..2b75d8d --- /dev/null +++ b/resources/icons/close.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/mac.png b/resources/icons/mac.png new file mode 100644 index 0000000..83412d4 Binary files /dev/null and b/resources/icons/mac.png differ diff --git a/resources/icons/maximise_off.svg b/resources/icons/maximise_off.svg new file mode 100644 index 0000000..99542c8 --- /dev/null +++ b/resources/icons/maximise_off.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/maximise_on.svg b/resources/icons/maximise_on.svg new file mode 100644 index 0000000..b8967f4 --- /dev/null +++ b/resources/icons/maximise_on.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/minimise.svg b/resources/icons/minimise.svg new file mode 100644 index 0000000..82c5364 --- /dev/null +++ b/resources/icons/minimise.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/tray.ico b/resources/icons/tray.ico new file mode 100644 index 0000000..b46f68c Binary files /dev/null and b/resources/icons/tray.ico differ diff --git a/resources/preload.js b/resources/preload.js index 2358aa2..dcbf4d9 100644 --- a/resources/preload.js +++ b/resources/preload.js @@ -35,7 +35,7 @@ require('electron').remote.getGlobal('setTimeout')(() => { css = ['user']; if (store.theme) css.push('theme'); css.forEach((file) => { - file = fs.readFileSync(`☃☃☃assets☃☃☃/${file}.css`); // will be set by python script + file = fs.readFileSync(`☃☃☃resources☃☃☃/${file}.css`); // will be set by python script let style = document.createElement('style'); style.type = 'text/css'; style.innerHTML = file; @@ -72,18 +72,34 @@ require('electron').remote.getGlobal('setTimeout')(() => { .querySelector('.notion-topbar-share-menu') .parentElement.classList.add('notion-topbar-actions'); - const button_icons = { + const button_icons_raw = { + alwaysontop_on: fs.readFileSync( + '☃☃☃resources☃☃☃/icons/alwaysontop_on.svg' + ), + alwaysontop_off: fs.readFileSync( + '☃☃☃resources☃☃☃/icons/alwaysontop_off.svg' + ), + minimize: fs.readFileSync('☃☃☃resources☃☃☃/icons/minimise.svg'), + maximize_on: fs.readFileSync('☃☃☃resources☃☃☃/icons/maximise_on.svg'), + maximize_off: fs.readFileSync('☃☃☃resources☃☃☃/icons/maximise_off.svg'), + close: fs.readFileSync('☃☃☃resources☃☃☃/icons/close.svg'), + }, + button_icons = { alwaysontop() { - return appwindow.isAlwaysOnTop() ? '🠙' : '🠛'; + return appwindow.isAlwaysOnTop() + ? button_icons_raw.alwaysontop_on + : button_icons_raw.alwaysontop_off; // '🠙' : '🠛' }, minimize() { - return '⚊'; + return button_icons_raw.minimize; // '⚊' }, maximize() { - return appwindow.isMaximized() ? '🗗' : '🗖'; + return appwindow.isMaximized() + ? button_icons_raw.maximize_on + : button_icons_raw.maximize_off; // '🗗' : '🗖' }, close() { - return '⨉'; + return button_icons_raw.close; // '⨉' }, }, button_actions = { @@ -118,6 +134,8 @@ require('electron').remote.getGlobal('setTimeout')(() => { close: document.querySelector('.window-button.btn-close'), }; + console.log(button_icons_raw); + button_elements.alwaysontop.innerHTML = button_icons.alwaysontop(); button_elements.alwaysontop.onclick = button_actions.alwaysontop; diff --git a/resources/theme.css b/resources/theme.css index 8048a2a..e0fa1f6 100644 --- a/resources/theme.css +++ b/resources/theme.css @@ -85,6 +85,9 @@ background: var(--theme-button) !important; box-shadow: 0 0 0 0.5px var(--theme-button_border); } +.window-button.btn-close:hover { + background: #e81123 !important; +} [style*='background: rgb(63, 68, 71)'] { background: var(--theme-card) !important; diff --git a/resources/tray.js b/resources/tray.js index 5628e28..912c249 100644 --- a/resources/tray.js +++ b/resources/tray.js @@ -28,19 +28,23 @@ function enhancements() { }, }); tray = new Tray( - new nativeImage.createFromPath(path.join(__dirname, 'logo.png')).resize({ - width: 16, - height: 16, - }) + isMac + ? new nativeImage.createFromPath('☃☃☃resources☃☃☃/icons/logo.png').resize( + { + width: 16, + height: 16, + } + ) + : '☃☃☃resources☃☃☃/icons/tray.ico' ); const contextMenu = Menu.buildFromTemplate([ { id: 'startup', - label: 'Run on Startup', + label: 'Run on startup', type: 'checkbox', checked: electron_1.app.getLoginItemSettings().openAtLogin, click: () => { - contextMenu.getMenuItemById('openhidden').checked + contextMenu.getMenuItemById('startup').checked ? electron_1.app.setLoginItemSettings({ openAtLogin: true }) : electron_1.app.setLoginItemSettings({ openAtLogin: false }); tray.setContextMenu(contextMenu); @@ -48,7 +52,7 @@ function enhancements() { }, { id: 'openhidden', - label: 'Hide on Open', + label: 'Hide on open', type: 'checkbox', checked: store.openhidden, click: () => { @@ -58,7 +62,7 @@ function enhancements() { }, { id: 'maximized', - label: 'Open Maximised', + label: 'Open maximised', type: 'checkbox', checked: store.maximized, click: () => { @@ -68,7 +72,7 @@ function enhancements() { }, { id: 'tray', - label: 'Close to Tray', + label: 'Close to tray', type: 'checkbox', checked: store.tray, click: () => { @@ -78,7 +82,7 @@ function enhancements() { }, { id: 'theme', - label: 'Load Custom Theme', + label: 'Load theme.css', type: 'checkbox', checked: store.theme, click: () => { diff --git a/resources/user.css b/resources/user.css index 2a28bde..fa98c88 100644 --- a/resources/user.css +++ b/resources/user.css @@ -58,7 +58,25 @@ border-radius: 4px; font-size: 16px; transition-duration: 0.2s; - cursor: default; + cursor: default; /* -- not sure? on windows native window buttons have the default cursor, + but other buttons in the titlebar have cursor: pointer */ +} +.window-button svg { + margin-top: 8px; + width: 14px; + height: 14px; +} +.window-button svg path { + fill: currentColor; +} +.window-button svg line { + stroke: currentColor; +} +.window-button.btn-close:hover { + background: #e81123 !important; +} +.window-button.btn-close:hover svg line { + stroke: white; } /* window control buttons: light theme */ @@ -74,13 +92,6 @@ background: rgb(71, 76, 80); } -/* set close button to red on hover */ - -.btn-close:hover{ - background: #E81123 !important; - color: white; -} - /* scrollbar: pointer */ .notion-scroller { cursor: auto;