From 1dd70ee634ae64cb44ba5faf4e3a0f4ea6d57a1c Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sun, 3 Jul 2022 19:32:04 -0500 Subject: [PATCH] Revert "Big Chungus Window settings (#1230)" (#1233) This reverts commit e133b2c38be160104416c8714a9dc47cf5fa4d71. --- src/i18n/README.md | 6 - src/i18n/en_US.json | 6 +- src/i18n/source/en_US.json | 6 +- src/main/base/browserwindow.ts | 15 +- src/renderer/assets/feather/plugins.svg | 48 --- src/renderer/assets/feather/style.svg | 41 -- src/renderer/less/pages.less | 286 ++++++-------- src/renderer/main/vueapp.js | 24 +- src/renderer/style.css | 202 ++++------ .../views/components/settings-keybinds.ejs | 323 --------------- .../components/settings-plugins-github.ejs | 188 --------- .../components/settings-themes-github.ejs | 197 ---------- .../views/components/settings-themes.ejs | 367 ------------------ .../views/components/settings-window.ejs | 343 +++++++++++++--- src/renderer/views/pages/installed-themes.ejs | 9 +- src/renderer/views/pages/plugins-github.ejs | 7 +- src/renderer/views/pages/themes-github.ejs | 7 +- 17 files changed, 504 insertions(+), 1571 deletions(-) delete mode 100644 src/renderer/assets/feather/plugins.svg delete mode 100644 src/renderer/assets/feather/style.svg delete mode 100644 src/renderer/views/components/settings-keybinds.ejs delete mode 100644 src/renderer/views/components/settings-plugins-github.ejs delete mode 100644 src/renderer/views/components/settings-themes-github.ejs delete mode 100644 src/renderer/views/components/settings-themes.ejs diff --git a/src/i18n/README.md b/src/i18n/README.md index cf5f1de4..182e730b 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -515,9 +515,3 @@ Update 21/06/2022 20:39 UTC Update 23/06/2022 04:00 UTC * `settings.option.connectivity.lastfmScrobble.filterTypes`: Added to `en_US` - - -Update 03/07/2022 20:00 UTC - -* `term.plugins`: Added to `en_US` -* `settings.header.visual.styles`: Added to `en_US` \ No newline at end of file diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index eea44749..f2ef03fd 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -184,9 +184,8 @@ "term.top": "Top", "term.version": "Version", "term.noVideos": "No videos found.", - "term.plugins": "Plugins", - "term.plugin": "Plugin", - "term.pluginMenu": "Plugins Menu", + "term.plugin": "Plug-in", + "term.pluginMenu": "Plug-in Menu", "term.pluginMenu.none": "No interactive plugins", "term.replay": "Replay", "term.uniqueAlbums": "Unique Albums", @@ -490,7 +489,6 @@ "settings.prompt.visual.theme.github.URL": "Enter the URL of the theme you want to install", "settings.prompt.visual.theme.uninstallTheme": "Are you sure you want to uninstall {{ theme }}?", "settings.option.visual.theme.checkForUpdates": "Check for updates", - "settings.header.visual.styles": "Styles", "settings.option.visual.theme.manageStyles": "Manage Styles", "settings.option.visual.theme.uninstall": "Uninstall", "settings.option.visual.theme.viewInfo": "View Info", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index e5ff2481..256b937d 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -180,9 +180,8 @@ "term.top": "Top", "term.version": "Version", "term.noVideos": "No videos found.", - "term.plugins": "Plugins", - "term.plugin": "Plugin", - "term.pluginMenu": "Plugins Menu", + "term.plugin": "Plug-in", + "term.pluginMenu": "Plug-in Menu", "term.pluginMenu.none": "No interactive plugins", "term.replay": "Replay", "term.uniqueAlbums": "Unique Albums", @@ -473,7 +472,6 @@ "settings.prompt.visual.theme.github.URL": "Enter the URL of the theme you want to install", "settings.prompt.visual.theme.uninstallTheme": "Are you sure you want to uninstall {{ theme }}?", "settings.option.visual.theme.checkForUpdates": "Check for updates", - "settings.header.visual.styles": "Styles", "settings.option.visual.theme.manageStyles": "Manage Styles", "settings.option.visual.theme.uninstall": "Uninstall", "settings.option.visual.theme.viewInfo": "View Info", diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 9474189a..da39d7eb 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -64,7 +64,7 @@ export class BrowserWindow { "pages/groupings", "pages/charts", "pages/settings", - //"pages/installed-themes", + "pages/installed-themes", "pages/listen_now", "pages/radio", "pages/home", @@ -80,12 +80,13 @@ export class BrowserWindow { "pages/about", "pages/library-videos", "pages/remote-pair", - //"pages/themes-github", - //"pages/plugins-github", + "pages/themes-github", + "pages/plugins-github", "pages/replay", "pages/audiolabs", "pages/zoo", "pages/plugin-renderer", + "pages/keybinds", "pages/oobe", "components/app-content", "components/sidebar", @@ -125,10 +126,6 @@ export class BrowserWindow { "components/hello-world", "components/inline-collection-list", "components/settings-window", - "components/settings-keybinds", - "components/settings-themes", - "components/settings-themes-github", - "components/settings-plugins-github", ], appRoutes: [ { @@ -278,10 +275,6 @@ export class BrowserWindow { page: "replay", component: ``, condition: `$root.page == 'replay'` - }, { - page: "keydinds", - component: ``, - condition: `$root.page == 'keybinds-settings'` } ] }, diff --git a/src/renderer/assets/feather/plugins.svg b/src/renderer/assets/feather/plugins.svg deleted file mode 100644 index 76eff3b0..00000000 --- a/src/renderer/assets/feather/plugins.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - diff --git a/src/renderer/assets/feather/style.svg b/src/renderer/assets/feather/style.svg deleted file mode 100644 index e6eae9e2..00000000 --- a/src/renderer/assets/feather/style.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index 32e0a739..d9bb93d8 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -23,7 +23,8 @@ .github-themes-page { display: flex; flex-direction: column; - height: 100%; + padding: 0px; + height: calc(100% - var(--navigationBarHeight)); .github-avatar { height: 42px; @@ -50,12 +51,10 @@ } .repos-list { - height: 85%; + height: 100%; + overflow-y: overlay; width: 320px; font-size: 14px; - position: absolute; - overflow: auto; - padding-bottom: 16px; > .list-group { margin: 0px; @@ -75,14 +74,11 @@ } .github-preview { - height: 85%; + height: 100%; flex: 1; + background: var(--color2); padding: 16px 32px; - overflow: auto; - position: fixed; - width: calc(100% - 574px); - margin-left: 320px; - padding-bottom: 16px; + overflow-y: overlay; } .gh-content { @@ -94,173 +90,6 @@ .gh-header { padding: 16px; - - .header-text { - position: initial !important; - justify-content: left !important; - } - } - - .installed-themes-page { - .style-editor-container { - height: 100%; - flex: 1; - background: var(--color2); - padding: 0px; - overflow-y: overlay; - - .list-group-item { - border-radius: 0px; - } - } - } -} - -//Styles Page -.installed-themes-page { - - .themeContextMenu { - background: transparent; - color: var(--keyColor); - border: 0px; - } - - .list-group-item { - &.addon { - background: rgb(86 86 86 / 20%); - } - - &.applied { - background: var(--keyColor-disabled); - pointer-events: none; - } - } - - .repo-header { - font-size: 16px; - position: sticky; - top: 0; - left: 0; - right: 0; - width: 100%; - height: 50px; - z-index: 1; - background: rgba(36, 36, 36, 0.5); - display: flex; - justify-content: center; - align-items: center; - backdrop-filter: var(--glassFilter); - overflow: hidden; - border-bottom: 1px solid rgb(0 0 0 / 18%); - border-top: 1px solid rgb(135 135 135 / 18%); - } - - .gh-header { - z-index: 5; - - .header-text { - position: initial !important; - justify-content: left !important; - } - } - - .gh-content { - display: contents; - flex-direction: column; - padding: 0px; - - .repos-list { - width: 320px; - position: fixed; - overflow: auto; - height: 90%; - font-size: 14px; - margin: 0 auto; - white-space: nowrap; - - > .list-group { - margin: 0px; - padding-bottom: 16px; - } - - .list-group-item { - padding: 12px 6px; - - &:hover { - filter: brightness(1.2); - } - - &:active { - filter: brightness(0.8); - } - } - } - - .style-editor-container { - height: 90%; - flex: 1; - padding: 0px; - margin-left: 320px; - position: fixed; - overflow: auto; - width: calc(100% - 574px); - - .stylestack-editor { - padding-bottom: 16px; - } - - .list-group-item { - border-radius: 0px; - } - } - } - - .stylestack-editor { - width: 100%; - - .btn, - .btn-group { - width: 100%; - } - - .themeLabel { - display: flex; - align-items: center; - } - - .handle { - height: 100%; - display: flex; - justify-content: center; - align-items: center; - } - - .list-group-item { - - &:hover { - cursor: grab; - } - - &:active { - cursor: grabbing; - } - } - - .removeItem { - border: 0px; - background: transparent; - height: 32px; - font-weight: bold; - color: var(--textColor); - cursor: pointer; - } - - .stylesDropdown { - > .dropdown-menu { - height: 300px; - overflow-y: overlay; - } - } } } @@ -1457,6 +1286,107 @@ /* Artist Page End */ + +.installed-themes-page { + + .themeContextMenu { + background: transparent; + color: var(--keyColor); + border: 0px; + } + + .list-group-item { + &.addon { + background: rgb(86 86 86 / 20%); + } + + &.applied { + background: var(--keyColor-disabled); + pointer-events: none; + } + } + + .repo-header { + font-size: 16px; + position: sticky; + top: 0; + left: 0; + right: 0; + width: 100%; + height: 50px; + z-index: 1; + background: rgba(36, 36, 36, 0.5); + display: flex; + justify-content: center; + align-items: center; + backdrop-filter: var(--glassFilter); + overflow: hidden; + border-bottom: 1px solid rgb(0 0 0 / 18%); + border-top: 1px solid rgb(135 135 135 / 18%); + } + + .style-editor-container { + height: 100%; + flex: 1; + background: var(--color2); + padding: 0px; + overflow-y: overlay; + + .list-group-item { + border-radius: 0px; + } + } + + + .stylestack-editor { + width: 100%; + + .btn, + .btn-group { + width: 100%; + } + + .themeLabel { + display: flex; + align-items: center; + } + + .handle { + height: 100%; + display: flex; + justify-content: center; + align-items: center; + } + + .list-group-item { + + &:hover { + cursor: grab; + } + + &:active { + cursor: grabbing; + } + } + + .removeItem { + border: 0px; + background: transparent; + height: 32px; + font-weight: bold; + color: var(--textColor); + cursor: pointer; + } + + .stylesDropdown { + > .dropdown-menu { + height: 300px; + overflow-y: overlay; + } + } + } +} + // Settings page .settings-page { padding: 0px; diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 36e18c36..c1b4026c 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -1120,7 +1120,7 @@ const app = new Vue({ message: `[Themes] ${theme.name} has an update available.` }) notify.on("click", () => { - app.openSettingsPage("github-themes") + app.appRoute("themes-github") notyf.dismiss(notify) }) } @@ -4441,32 +4441,20 @@ const app = new Vue({ case "audiolabs": this.$store.state.pageState.settings.currentTabIndex = 2 break; - case "styles": + case "visual": this.$store.state.pageState.settings.currentTabIndex = 3 break; - case "visual": + case "lyrics": this.$store.state.pageState.settings.currentTabIndex = 4 break; - case "plugins": + case "connectivity": this.$store.state.pageState.settings.currentTabIndex = 5 break; - case "lyrics": + case "advanced": this.$store.state.pageState.settings.currentTabIndex = 6 break; - case "connectivity": - this.$store.state.pageState.settings.currentTabIndex = 7 - break; - case "advanced": - this.$store.state.pageState.settings.currentTabIndex = 8 - break; case "keybindings": - this.$store.state.pageState.settings.currentTabIndex = 9 - break; - case "github-themes": - this.$store.state.pageState.settings.currentTabIndex = 10 - break; - case "github-plugins": - this.$store.state.pageState.settings.currentTabIndex = 11 + this.$store.state.pageState.settings.currentTabIndex = 7 break; } app.modals.settings = true diff --git a/src/renderer/style.css b/src/renderer/style.css index 4c8c1645..cc9b934e 100644 --- a/src/renderer/style.css +++ b/src/renderer/style.css @@ -12985,8 +12985,8 @@ input[type=checkbox][switch]:checked:active::before { .github-themes-page { display: flex; flex-direction: column; - padding-top: var(--chromeHeight1); - height: 100%; + padding: 0px; + height: calc(100% - var(--navigationBarHeight)); } .github-themes-page .github-avatar { height: 42px; @@ -13042,129 +13042,6 @@ input[type=checkbox][switch]:checked:active::before { .github-themes-page .gh-header { padding: 16px; } -.github-themes-page .installed-themes-page .style-editor-container { - height: 100%; - flex: 1; - background: var(--color2); - padding: 0px; - overflow-y: overlay; -} -.github-themes-page .installed-themes-page .style-editor-container .list-group-item { - border-radius: 0px; -} -.installed-themes-page .themeContextMenu { - background: transparent; - color: var(--keyColor); - border: 0px; -} -.installed-themes-page .list-group-item.addon { - background: rgba(86, 86, 86, 0.2); -} -.installed-themes-page .list-group-item.applied { - background: var(--keyColor-disabled); - pointer-events: none; -} -.installed-themes-page .repo-header { - font-size: 16px; - position: sticky; - top: 0; - left: 0; - right: 0; - width: 100%; - height: 50px; - z-index: 1; - background: rgba(36, 36, 36, 0.5); - display: flex; - justify-content: center; - align-items: center; - backdrop-filter: var(--glassFilter); - overflow: hidden; - border-bottom: 1px solid rgba(0, 0, 0, 0.18); - border-top: 1px solid rgba(135, 135, 135, 0.18); -} -.installed-themes-page .gh-header { - z-index: 5; -} -.installed-themes-page .gh-header .header-text { - position: initial; - justify-content: left; -} -.installed-themes-page .gh-content { - display: contents; - flex-direction: column; - padding: 0px; -} -.installed-themes-page .gh-content .repos-list { - width: 320px; - position: absolute; - overflow: auto; - height: 90%; - font-size: 14px; -} -.installed-themes-page .gh-content .repos-list > .list-group { - margin: 0px; - padding-bottom: 16px; -} -.installed-themes-page .gh-content .repos-list .list-group-item { - padding: 12px 6px; -} -.installed-themes-page .gh-content .repos-list .list-group-item:hover { - filter: brightness(1.2); -} -.installed-themes-page .gh-content .repos-list .list-group-item:active { - filter: brightness(0.8); -} -.installed-themes-page .gh-content .style-editor-container { - height: 90%; - flex: 1; - /* background: var(--color2); */ - padding: 0px; - margin-left: 320px; - position: absolute; - overflow: auto; - width: calc(-webkit-fill-available - 320px); -} -.installed-themes-page .gh-content .style-editor-container .stylestack-editor { - padding-bottom: 16px; -} -.installed-themes-page .gh-content .style-editor-container .list-group-item { - border-radius: 0px; -} -.installed-themes-page .stylestack-editor { - width: 100%; -} -.installed-themes-page .stylestack-editor .btn, -.installed-themes-page .stylestack-editor .btn-group { - width: 100%; -} -.installed-themes-page .stylestack-editor .themeLabel { - display: flex; - align-items: center; -} -.installed-themes-page .stylestack-editor .handle { - height: 100%; - display: flex; - justify-content: center; - align-items: center; -} -.installed-themes-page .stylestack-editor .list-group-item:hover { - cursor: grab; -} -.installed-themes-page .stylestack-editor .list-group-item:active { - cursor: grabbing; -} -.installed-themes-page .stylestack-editor .removeItem { - border: 0px; - background: transparent; - height: 32px; - font-weight: bold; - color: var(--textColor); - cursor: pointer; -} -.installed-themes-page .stylestack-editor .stylesDropdown > .dropdown-menu { - height: 300px; - overflow-y: overlay; -} .library-page { padding: 0px; } @@ -14160,6 +14037,81 @@ input[type=checkbox][switch]:checked:active::before { background: rgba(200, 200, 200, 0.1); } /* Artist Page End */ +.installed-themes-page .themeContextMenu { + background: transparent; + color: var(--keyColor); + border: 0px; +} +.installed-themes-page .list-group-item.addon { + background: rgba(86, 86, 86, 0.2); +} +.installed-themes-page .list-group-item.applied { + background: var(--keyColor-disabled); + pointer-events: none; +} +.installed-themes-page .repo-header { + font-size: 16px; + position: sticky; + top: 0; + left: 0; + right: 0; + width: 100%; + height: 50px; + z-index: 1; + background: rgba(36, 36, 36, 0.5); + display: flex; + justify-content: center; + align-items: center; + backdrop-filter: var(--glassFilter); + overflow: hidden; + border-bottom: 1px solid rgba(0, 0, 0, 0.18); + border-top: 1px solid rgba(135, 135, 135, 0.18); +} +.installed-themes-page .style-editor-container { + height: 100%; + flex: 1; + background: var(--color2); + padding: 0px; + overflow-y: overlay; +} +.installed-themes-page .style-editor-container .list-group-item { + border-radius: 0px; +} +.installed-themes-page .stylestack-editor { + width: 100%; +} +.installed-themes-page .stylestack-editor .btn, +.installed-themes-page .stylestack-editor .btn-group { + width: 100%; +} +.installed-themes-page .stylestack-editor .themeLabel { + display: flex; + align-items: center; +} +.installed-themes-page .stylestack-editor .handle { + height: 100%; + display: flex; + justify-content: center; + align-items: center; +} +.installed-themes-page .stylestack-editor .list-group-item:hover { + cursor: grab; +} +.installed-themes-page .stylestack-editor .list-group-item:active { + cursor: grabbing; +} +.installed-themes-page .stylestack-editor .removeItem { + border: 0px; + background: transparent; + height: 32px; + font-weight: bold; + color: var(--textColor); + cursor: pointer; +} +.installed-themes-page .stylestack-editor .stylesDropdown > .dropdown-menu { + height: 300px; + overflow-y: overlay; +} .settings-page { padding: 0px; } diff --git a/src/renderer/views/components/settings-keybinds.ejs b/src/renderer/views/components/settings-keybinds.ejs deleted file mode 100644 index 24805c29..00000000 --- a/src/renderer/views/components/settings-keybinds.ejs +++ /dev/null @@ -1,323 +0,0 @@ - - - \ No newline at end of file diff --git a/src/renderer/views/components/settings-plugins-github.ejs b/src/renderer/views/components/settings-plugins-github.ejs deleted file mode 100644 index 4bd927ed..00000000 --- a/src/renderer/views/components/settings-plugins-github.ejs +++ /dev/null @@ -1,188 +0,0 @@ - - diff --git a/src/renderer/views/components/settings-themes-github.ejs b/src/renderer/views/components/settings-themes-github.ejs deleted file mode 100644 index 24f4aec9..00000000 --- a/src/renderer/views/components/settings-themes-github.ejs +++ /dev/null @@ -1,197 +0,0 @@ - - \ No newline at end of file diff --git a/src/renderer/views/components/settings-themes.ejs b/src/renderer/views/components/settings-themes.ejs deleted file mode 100644 index 57f38d10..00000000 --- a/src/renderer/views/components/settings-themes.ejs +++ /dev/null @@ -1,367 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/renderer/views/components/settings-window.ejs b/src/renderer/views/components/settings-window.ejs index 402c2cba..1236d71d 100644 --- a/src/renderer/views/components/settings-window.ejs +++ b/src/renderer/views/components/settings-window.ejs @@ -221,7 +221,7 @@ {{$root.getLz('settings.option.general.keybindings')}}
-
@@ -409,17 +409,6 @@ - - -
- -
-