fix: Reset modal now works, widget order has reset button etc

This commit is contained in:
David Ralph
2021-03-31 12:21:37 +01:00
parent 353fa85cba
commit 5f9bc4a94b
11 changed files with 75 additions and 29 deletions

View File

@@ -11,6 +11,7 @@ import Background from '../settings/sections/background/Background';
import Advanced from '../settings/sections/Advanced';
import Changelog from '../settings/sections/Changelog';
import Order from '../settings/sections/Order';
import Experimental from '../settings/sections/Experimental';
import Tabs from './backend/Tabs';
@@ -25,10 +26,10 @@ export default function Settings() {
<div label={language.background.title}><Background/></div>
<div label={language.search.title}><Search/></div>
<div label={language.appearance.title}><Appearance/></div>
<div label='Order'><Order/></div>
<div label={language.order}><Order/></div>
<div label={language.language.title}><Language/></div>
<div label={language.advanced.title}><Advanced/></div>
<div label='Experimental'></div>
<div label={language.experimental.title}><Experimental/></div>
<div label={language.changelog}><Changelog/></div>
<div label={language.about.title}><About/></div>
</Tabs>

View File

@@ -34,26 +34,29 @@ export default function Tab(props) {
}
}
const language = window.language.modals.main.settings.sections;
const navbarlanguage = window.language.modals.main.navbar;
let icon, divider;
switch (props.label) {
// Navbar
case 'Settings': icon = <Settings/>; break;
case 'My Add-ons': icon = <Addons/>; break;
case 'Marketplace': icon = <Marketplace/>; break;
case navbarlanguage.settings: icon = <Settings/>; break;
case navbarlanguage.addons: icon = <Addons/>; break;
case navbarlanguage.marketplace: icon = <Marketplace/>; break;
// Settings
case 'Time': icon = <Time/>; break;
case 'Greeting': icon = <Greeting/>; break;
case 'Quote': icon = <Quote/>; break;
case 'Background': icon = <Background/>; break;
case 'Search': icon = <Search/>; break;
case 'Appearance': icon = <Appearance/>; break;
case 'Order': icon = <Order/>; break;
case 'Language': icon = <Language/>; divider = true; break;
case 'Advanced': icon = <Settings/>; break;
case 'Experimental': icon = <Experimental/>; divider = true; break;
case 'Change Log': icon = <Changelog/>; break;
case 'About': icon = <About/>; break;
case language.time.title: icon = <Time/>; break;
case language.greeting.title: icon = <Greeting/>; break;
case language.quote.title: icon = <Quote/>; break;
case language.background.title: icon = <Background/>; break;
case language.search.title: icon = <Search/>; break;
case language.appearance.title: icon = <Appearance/>; break;
case language.order: icon = <Order/>; break;
case language.language.title: icon = <Language/>; divider = true; break;
case language.advanced.title: icon = <Settings/>; break;
case language.experimental.title: icon = <Experimental/>; divider = true; break;
case language.changelog: icon = <Changelog/>; break;
case language.about.title: icon = <About/>; break;
// Store
case 'Photo Packs': icon = <Background/>; break;
@@ -63,6 +66,12 @@ export default function Tab(props) {
default: break;
}
if (props.label === language.experimental.title) {
if (localStorage.getItem('experimental') === 'false') {
return <hr/>;
}
}
return (
<>
<li className={className} onClick={() => props.onClick(props.label)}>

View File

@@ -21,7 +21,7 @@ export default class Tabs extends React.PureComponent {
render() {
let className = 'sidebar';
let tabClass = 'tab-content';
let optionsText = (<h1>Options</h1>);
let optionsText = (<h1>{window.language.modals.main.title}</h1>);
if (this.props.navbar) {
className = 'modalNavbar';