diff --git a/src/common/interfaces/SettingsInterface.ts b/src/common/interfaces/SettingsInterface.ts index 3e8946f..d9569cd 100644 --- a/src/common/interfaces/SettingsInterface.ts +++ b/src/common/interfaces/SettingsInterface.ts @@ -355,7 +355,8 @@ export interface SiteSettingsInterface { enableAard: ExtensionEnvironmentSettingsInterface; enableKeyboard: ExtensionEnvironmentSettingsInterface; - type?: 'official' | 'community' | 'user-defined' | 'testing' | 'officially-disabled'; + type?: 'official' | 'community' | 'user-defined' | 'testing' | 'officially-disabled' | 'unknown' | 'modified'; + defaultType: 'official' | 'community' | 'user-defined' | 'testing' | 'officially-disabled' | 'unknown' | 'modified'; // must be defined in @global and @empty persistCSA?: CropModePersistence, // CSA - crop, stretch, alignment diff --git a/src/csui/res/css/common.scss b/src/csui/res/css/common.scss index 5b11612..4614288 100644 --- a/src/csui/res/css/common.scss +++ b/src/csui/res/css/common.scss @@ -389,3 +389,8 @@ small { .monospace { font-family: 'Overpass Mono'; } + +.pointer { + cursor: pointer; + user-select: none; +} diff --git a/src/csui/src/PlayerUIWindow.vue b/src/csui/src/PlayerUIWindow.vue index 4c91ddf..e38ca57 100644 --- a/src/csui/src/PlayerUIWindow.vue +++ b/src/csui/src/PlayerUIWindow.vue @@ -267,7 +267,7 @@ export default { } &.community { - background-color: rgb(47, 47, 97); + background-color: rgb(85, 85, 179); color: #fff; .mdi { diff --git a/src/csui/src/PlayerUiPanels/BaseExtensionSettings.vue b/src/csui/src/PlayerUiPanels/BaseExtensionSettings.vue index 0700575..39a53f0 100644 --- a/src/csui/src/PlayerUiPanels/BaseExtensionSettings.vue +++ b/src/csui/src/PlayerUiPanels/BaseExtensionSettings.vue @@ -48,6 +48,13 @@ > + @@ -56,8 +63,9 @@ + + + + diff --git a/src/csui/src/PlayerUiPanels/PanelComponents/ExtensionSettings/SiteExtensionSettings.vue b/src/csui/src/PlayerUiPanels/PanelComponents/ExtensionSettings/SiteExtensionSettings.vue index 6a84f01..3bbd59a 100644 --- a/src/csui/src/PlayerUiPanels/PanelComponents/ExtensionSettings/SiteExtensionSettings.vue +++ b/src/csui/src/PlayerUiPanels/PanelComponents/ExtensionSettings/SiteExtensionSettings.vue @@ -408,8 +408,6 @@ export default { setExtensionMode(component, event) { const option = event.target.value; - console.log('setting option', component, 'to', event.target.value); - if (option === 'complex') { return; } @@ -458,3 +456,8 @@ export default { + diff --git a/src/csui/src/res-common/common.scss b/src/csui/src/res-common/common.scss index 1ee4905..d9c522a 100644 --- a/src/csui/src/res-common/common.scss +++ b/src/csui/src/res-common/common.scss @@ -150,3 +150,8 @@ h1, h2, h3 { padding: 0.25rem 0.5rem; padding-top: 0.5rem; } + +.pointer { + cursor: pointer; + user-select: none; +} diff --git a/src/csui/src/res-common/panels.scss b/src/csui/src/res-common/panels.scss index e813044..8406ed8 100644 --- a/src/csui/src/res-common/panels.scss +++ b/src/csui/src/res-common/panels.scss @@ -20,3 +20,7 @@ background-color:rgba(0, 0, 0, 0.75) } } + +.container { + background-color: rgba(0, 0, 0, 0.5); +} diff --git a/src/ext/conf/ExtConfPatches.ts b/src/ext/conf/ExtConfPatches.ts index 5bcda1f..93ce055 100644 --- a/src/ext/conf/ExtConfPatches.ts +++ b/src/ext/conf/ExtConfPatches.ts @@ -264,6 +264,15 @@ const ExtensionConfPatch = [ } userOptions.sites['@empty'].defaults.alignment = {x: VideoAlignmentType.Default, y: VideoAlignmentType.Default}; } + }, { + forVersion: '5.99.6', + updateFn: (userOptions: SettingsInterface, defaultOptions) => { + for (const site in userOptions.sites) { + userOptions.sites[site].defaultType = userOptions.sites[site].type as any; + } + userOptions.sites['@global'].defaultType = 'unknown'; + userOptions.sites['@empty'].defaultType = 'modified'; + } } ]; diff --git a/src/ext/conf/ExtensionConf.ts b/src/ext/conf/ExtensionConf.ts index 33133ef..5a953af 100644 --- a/src/ext/conf/ExtensionConf.ts +++ b/src/ext/conf/ExtensionConf.ts @@ -1441,7 +1441,7 @@ const ExtensionConf: SettingsInterface = { theater: ExtensionMode.Enabled, normal: ExtensionMode.Disabled }, - + defaultType: 'unknown', persistCSA: CropModePersistence.Disabled, defaults: { @@ -1467,6 +1467,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Default }, type: 'user-defined', + defaultType: 'user-defined', persistCSA: CropModePersistence.Default, defaults: { crop: null, @@ -1492,6 +1493,8 @@ const ExtensionConf: SettingsInterface = { }, override: false, // ignore value localStorage in favour of this type: 'official', // is officially supported? (Alternatives are 'community' and 'user-defined') + defaultType: 'official', // if user mucks around with settings, type changes to 'user-defined'. + // We still want to know what the original type was, hence defaultType activeDOMConfig: 'official', DOMConfig: { @@ -1524,6 +1527,7 @@ const ExtensionConf: SettingsInterface = { }, override: false, type: 'community', + defaultType: 'community', }, "www.disneyplus.com" : { enable: { @@ -1542,6 +1546,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Default }, type: 'community', + defaultType: 'community', activeDOMConfig: 'community-mstefan99', DOMConfig: { 'community-mstefan99': { @@ -1577,32 +1582,34 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Default }, type: 'official', + defaultType: 'official', }, - "streamable.com": { - enable: { - fullscreen: ExtensionMode.Default, - theater: ExtensionMode.Default, - normal: ExtensionMode.Default, - }, - enableAard: { - fullscreen: ExtensionMode.Default, - theater: ExtensionMode.Default, - normal: ExtensionMode.Default, - }, - enableKeyboard: { - fullscreen: ExtensionMode.Default, - theater: ExtensionMode.Default, - normal: ExtensionMode.Default - }, - type: 'official', - activeDOMConfig: 'official', - DOMConfig: { - 'official': { - type: 'official', - customCss: ".player {text-align: left}" - } - } - }, + // "streamable.com": { + // enable: { + // fullscreen: ExtensionMode.Default, + // theater: ExtensionMode.Default, + // normal: ExtensionMode.Default, + // }, + // enableAard: { + // fullscreen: ExtensionMode.Default, + // theater: ExtensionMode.Default, + // normal: ExtensionMode.Default, + // }, + // enableKeyboard: { + // fullscreen: ExtensionMode.Default, + // theater: ExtensionMode.Default, + // normal: ExtensionMode.Default + // }, + // type: 'official', + // type: 'defaultType', + // activeDOMConfig: 'official', + // DOMConfig: { + // 'official': { + // type: 'official', + // customCss: ".player {text-align: left}" + // } + // } + // }, "vimeo.com": { enable: { fullscreen: ExtensionMode.Default, @@ -1620,6 +1627,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Default }, type: 'official', + defaultType: 'official', activeDOMConfig: 'official', DOMConfig: { 'official': { @@ -1651,6 +1659,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Disabled, }, type: 'officially-disabled', + defaultType: 'officially-disabled', activeDOMConfig: 'official', DOMConfig: { 'official': { @@ -1682,6 +1691,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Disabled, }, type: 'officially-disabled', + defaultType: 'officially-disabled', activeDOMConfig: 'official', DOMConfig: { 'official': { @@ -1713,6 +1723,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Disabled, }, type: 'officially-disabled', + defaultType: 'officially-disabled', }, "gfycat.com": { enable: { @@ -1731,6 +1742,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Disabled, }, type: 'officially-disabled', + defaultType: 'officially-disabled', }, "giant.gfycat.com": { enable: { @@ -1749,6 +1761,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Disabled, }, type: 'officially-disabled', + defaultType: 'officially-disabled', }, "www.wakanim.tv": { enable: { @@ -1767,6 +1780,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Default }, type: 'community', + defaultType: 'community', activeDOMConfig: 'community', DOMConfig: { 'community': { @@ -1797,6 +1811,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Default }, type: 'community', + defaultType: 'community', activeDOMConfig: 'community', DOMConfig: { 'community': { @@ -1822,6 +1837,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Default }, type: "community", + defaultType: "community", activeDOMConfig: 'community', DOMConfig: { 'community': { @@ -1851,6 +1867,7 @@ const ExtensionConf: SettingsInterface = { normal: ExtensionMode.Default }, type: "community", + defaultType: "community", activeDOMConfig: 'community', DOMConfig: { 'community': { diff --git a/src/ext/lib/settings/SiteSettings.ts b/src/ext/lib/settings/SiteSettings.ts index c17e909..275d845 100644 --- a/src/ext/lib/settings/SiteSettings.ts +++ b/src/ext/lib/settings/SiteSettings.ts @@ -80,7 +80,6 @@ export class SiteSettings { } } - for (const enableSegment of ['enable', 'enableAard', 'enableKeyboard']) { if (!this.data[enableSegment]) { this.data[enableSegment] = {}; diff --git a/src/manifest.json b/src/manifest.json index 977ba89..161316c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "Ultrawidify", "description": "Removes black bars on ultrawide videos and offers advanced options to fix aspect ratio.", - "version": "5.99.5", + "version": "5.99.6", "icons": { "32":"res/icons/uw-32.png", "64":"res/icons/uw-64.png"