diff --git a/external/sciterui b/external/sciterui index 1dc05d97..00857113 160000 --- a/external/sciterui +++ b/external/sciterui @@ -1 +1 @@ -Subproject commit 1dc05d97e7b624548f29d8c4db7ea5433eef8a25 +Subproject commit 008571130310f2159286560205b2e31dea022846 diff --git a/lang/english/css/about_dialog.css b/lang/english/css/about_dialog.css new file mode 100644 index 00000000..76cc64e4 --- /dev/null +++ b/lang/english/css/about_dialog.css @@ -0,0 +1,157 @@ +html +{ + margin: 0; + padding: 0; + overflow: hidden; + height: max-content; +} + +body +{ + flow: vertical; + width: 100%%; + height: max-content; +} + +.about-body +{ + flow: vertical; + width: 100%%; + padding: 1em 1.25em 0.25em 1.25em; +} + +body>.footer +{ + padding: 0.35em 1.25em 0.5em 1.25em; +} + +.about-row-top +{ + flow: horizontal; + vertical-align: middle; + width: 100%%; + margin-bottom: 0.85em; +} + +.about-logo-wrap +{ + width: 40%%; + margin-right: 1em; + horizontal-align: center; +} + +.about-logo +{ + display: block; + width: 100%%; + height: width(100%%); + margin: 0 auto; + image-rendering: auto; +} + +.about-product +{ + width: *; + flow: vertical; + text-align: center; + horizontal-align: center; + vertical-align: middle; +} + +.about-name +{ + font-size: 1.5rem; + font-weight: 600; + margin-top: *; + margin-bottom: 0.2em; + color: var(--color-ui-text-primary); +} + +.about-version, +.about-copyright +{ + color: var(--color-ui-text-muted); +} + +.about-version +{ + margin-bottom: 0.15em; +} + +.about-copyright +{ + font-size: 0.85rem; + margin-bottom: *; +} + +.about-row-content +{ + width: 100%%; +} + +.about-description +{ + line-height: 1.45; + margin-bottom: 0.85em; + color: var(--color-ui-text-primary); +} + +.about-description p +{ + margin: 0 0 0.65em 0; +} + +.about-disclaimer +{ + color: var(--color-ui-text-muted); + font-size: 0.9rem; +} + +.about-credits +{ + margin-bottom: 0.85em; + line-height: 1.45; +} + +.about-credits-title +{ + color: var(--color-ui-text-primary); + font-weight: 600; + margin-bottom: 0.25em; +} + +.about-credits-list +{ + color: var(--color-ui-text-muted); + font-size: 0.9rem; +} + +.about-links +{ + margin-bottom: 0.75em; + line-height: 1.5; +} + +.about-link-sep +{ + color: var(--color-ui-text-muted); +} + +a.about-link +{ + color: #3cafe9; + text-decoration: underline; + cursor: pointer; +} + +a.about-link:hover +{ + color: #7ec8f7; +} + +.about-trademark +{ + color: var(--color-ui-text-muted); + font-size: 0.75rem; + line-height: 1.35; +} \ No newline at end of file diff --git a/lang/english/css/base.css b/lang/english/css/base.css index 8c511fcc..50798979 100644 --- a/lang/english/css/base.css +++ b/lang/english/css/base.css @@ -139,274 +139,3 @@ html > header > window-buttons > window-button[role="window-minimize"] { foreground-image: url(icon:window-minimize); } - -ul#menu-bar -{ - margin: 0; - padding: 0 0.5em 0.3em 0.5em; - background: var(--color-menubar-background); - color: var(--color-ui-text-primary); - font-family: var(--font-ui); - font-size: 0.9em; - font-weight: 100; - behavior:menu-bar; - flow: horizontal; -} - -ul#menu-bar > li -{ - padding: 0.28em 0.55em; - margin: 0; - white-space: nowrap; - width: max-content; - display: block; - flow: horizontal; - border-radius: 5px; -} - -ul#menu-bar > li:hover -{ - background: var(--color-menubar-background-hover); -} - -ul#menu-bar:focus > li:current, -ul#menu-bar > li:owns-popup { - background-color: var(--color-menubar-background-active); - border-radius: 5px 5px 0; -} - -ul#menu-bar caption u, -menu li .menu-item-label u -{ - text-decoration: none; -} - -[data-menu-mnemonics="1"] ul#menu-bar caption u, -[data-menu-mnemonics="1"] menu li .menu-item-label u, -ul#menu-bar > li:owns-popup caption u, -menu[window-state="shown"] li .menu-item-label u, -menu[window-state="shown"] caption u -{ - text-decoration: underline; -} - -menu -{ - behavior:menu; - flow: vertical; - display:none; - margin:0; - padding: 0.35em 0; - min-width: 14em; - max-width:max-content; - background: var(--color-menu-popup-background); - color: #f0f0f0; - border: 1px solid var(--color-menu-popup-border); - border-top: none; - box-shadow: 0 0.25em 0.75em var(--color-menu-popup-shadow); -} - -@media (menu-animation-supported) { - menu { - popup-animation: popup-animation(type:blend,duration:100ms); - } -} - -menu menu -{ - max-width: max-content; -} - -menu li -{ - width:*; - display:block; - flow:horizontal; - vertical-align:middle; - foreground-repeat: no-repeat; - foreground-position: left 2px top 50%; - padding: 0.4em 1.75em 0.4em 1.1em; - margin: 0; -} - -menu li .menu-item-label -{ - width: *; - text-align: left; -} - -menu li:has-child-of-type(menu) caption -{ - width: *; - text-align: left; -} - -menu li:current caption, -menu li:hover:owns-popup caption -{ - color: #f0f0f0; -} - -menu li .menu-item-glyph -{ - width: 1.15em; - min-width: 1.15em; - max-width: 1.15em; - min-height: 1.15em; - max-height: 1.15em; - margin: 0 0.55em 0 0; - box-sizing: border-box; - display: inline-block; - vertical-align: middle; - flex-shrink: 0; - foreground-image: none; -} - -menu li .menu-item-glyph.menu-item-glyph-spacer -{ - border: 1.5px solid transparent; - border-radius: 3px; - position: relative; -} - -menu li .menu-item-glyph.menu-item-checkbox -{ - border: 1.5px solid var(--color-ui-text-muted, #8c8c8c); - border-radius: 3px; - position: relative; - foreground-image: none; -} - -menu li .menu-item-glyph.menu-item-checkbox.checked -{ - border-color: var(--color-ui-text-primary, #f0f0f0); -} - -menu li .menu-item-glyph.menu-item-icon-svg -{ - border: none; - width: 1.15em; - height: 1.15em; - min-width: 1.15em; - max-width: 1.15em; - padding: 0; -} - -menu li .menu-item-glyph.menu-item-icon-svg svg -{ - width: 1.05em; - height: 1.05em; - display: block; - vertical-align: middle; -} - -menu li .menu-item-glyph.menu-item-icon-svg path, -menu li .menu-item-glyph.menu-item-icon-svg circle -{ - fill: currentColor; -} - -menu li .menu-item-glyph.menu-item-icon-svg path[fill="none"], -menu li .menu-item-glyph.menu-item-icon-svg circle[fill="none"] -{ - fill: none; - stroke: currentColor; -} - -menu li .menu-item-glyph .menu-item-checkmark -{ - position: absolute; - left: 0; - top: 0; - width: *; - height: *; - text-align: center; - vertical-align: middle; - font-size: 0.72em; - line-height: 1.15em; - color: var(--color-ui-text-primary, #f0f0f0); -} - -menu li:current .menu-item-glyph.menu-item-checkbox, -menu li:hover:owns-popup .menu-item-glyph.menu-item-checkbox -{ - border-color: #f0f0f0; -} - -menu li:current .menu-item-glyph .menu-item-checkmark, -menu li:hover:owns-popup .menu-item-glyph .menu-item-checkmark -{ - color: #f0f0f0; -} - -menu li .menu-accelerator -{ - width: max-content; - margin-left: 2.5em; - white-space: nowrap; - text-align: right; - color: var(--color-menu-shortcut-text); -} - -menu li .menu-accelerator:empty -{ - display: none; - margin: 0; - width: 0; -} - -menu li:hover -{ - background: var(--color-menuitem-background-hover); - border-radius: 2px; -} - -menu li:current, -menu li:hover:owns-popup -{ - background-color: #094771; - border-radius: 2px; -} - -menu li:current .menu-item-label, -menu li:current .menu-accelerator, -menu li:hover:owns-popup .menu-item-label, -menu li:hover:owns-popup .menu-accelerator -{ - color: #f0f0f0; -} - -menu li:disabled -{ - color:graytext; - foreground-image: none; -} - -menu li:has-child-of-type(menu) -{ - foreground-image:url(stock:arrow-right); - foreground-repeat: no-repeat; - foreground-position: top 50% right 2px; -} - -menu li:has-child-of-type(menu):rtl -{ - foreground-image:url(stock:arrow-left); - foreground-repeat: no-repeat; - foreground-position: top 50% left 2px; -} - -hr -{ - padding: 0; - margin: 0.2em 0; -} - -menu hr -{ - display: block; - height: 1px; - margin: 0.4em 0.65em; - border: none; - background: var(--color-menu-separator); -} diff --git a/lang/english/css/config.css b/lang/english/css/config.css index d2e41123..152b9894 100644 --- a/lang/english/css/config.css +++ b/lang/english/css/config.css @@ -1,28 +1,11 @@ :root { - --color-config-background: #181818; --color-config-page: #31363B; --color-config-page-border: #505050; } -html -{ - background: var(--color-config-background); -} - -button -{ - color: #eff0f1; - background: #232728; - border: 1px solid #55575a; - font-family: 'Segoe UI', Arial, sans-serif; - font-size: 0.8rem; - padding: 0.2rem; - min-width: 5rem; -} - div.ConfigPage { - background: var(--color-config-background); + background: var(--color-dialog-background); flow: horizontal; width: 100%%; height: 100%%; @@ -44,16 +27,6 @@ popup.tooltip margin: 0 0 0 0.3rem; } -button:hover -{ - border: 1px solid #3cafe9; -} - -button:active -{ - background: #3cafe9; -} - .tabs { display: flex; font-size: 0; @@ -147,12 +120,6 @@ button:active height: 1.4rem; } -.footer -{ - padding: 0.5rem 0 0; - text-align: right; -} - #ConfigContents { width: 100%%; height: 100%%; diff --git a/lang/english/css/dialog.css b/lang/english/css/dialog.css new file mode 100644 index 00000000..7e102bb0 --- /dev/null +++ b/lang/english/css/dialog.css @@ -0,0 +1,30 @@ +:root { + --color-dialog-background: #181818; +} + +html { + background: var(--color-dialog-background); +} + +button { + color: #eff0f1; + background: #232728; + border: 1px solid #55575a; + font-family: var(--font-ui); + font-size: 0.8rem; + padding: 0.2rem; + min-width: 5rem; +} + +button:hover { + border: 1px solid #3cafe9; +} + +button:active { + background: #3cafe9; +} + +.footer { + padding: 0.5rem 0 0; + text-align: right; +} diff --git a/lang/english/css/main_window.css b/lang/english/css/main_window.css index 5f673ee3..cab63879 100644 --- a/lang/english/css/main_window.css +++ b/lang/english/css/main_window.css @@ -358,3 +358,268 @@ rombrowser .games-grid[data-size="4"] .rom-card { display: none !important; } + +ul#menu-bar +{ + margin: 0; + padding: 0 0.5em 0.3em 0.5em; + background: var(--color-menubar-background); + color: var(--color-ui-text-primary); + font-family: var(--font-ui); + font-size: 0.9em; + font-weight: 100; + behavior:menu-bar; + flow: horizontal; +} + +ul#menu-bar > li +{ + padding: 0.28em 0.55em; + margin: 0; + white-space: nowrap; + width: max-content; + display: block; + flow: horizontal; + border-radius: 5px; +} + +ul#menu-bar > li:hover +{ + background: var(--color-menubar-background-hover); +} + +ul#menu-bar:focus > li:current, +ul#menu-bar > li:owns-popup { + background-color: var(--color-menubar-background-active); + border-radius: 5px 5px 0; +} + +ul#menu-bar caption u, +menu li .menu-item-label u +{ + text-decoration: none; +} + +[data-menu-mnemonics="1"] ul#menu-bar caption u, +[data-menu-mnemonics="1"] menu li .menu-item-label u, +ul#menu-bar > li:owns-popup caption u, +menu[window-state="shown"] li .menu-item-label u, +menu[window-state="shown"] caption u +{ + text-decoration: underline; +} + +menu +{ + behavior:menu; + flow: vertical; + display:none; + margin:0; + padding: 0.35em 0; + min-width: 14em; + max-width:max-content; + background: var(--color-menu-popup-background); + color: #f0f0f0; + border: 1px solid var(--color-menu-popup-border); + border-top: none; + box-shadow: 0 0.25em 0.75em var(--color-menu-popup-shadow); +} + +@media (menu-animation-supported) { + menu { + popup-animation: popup-animation(type:blend,duration:100ms); + } +} + +menu menu +{ + max-width: max-content; +} + +menu li +{ + width:*; + display:block; + flow:horizontal; + vertical-align:middle; + foreground-repeat: no-repeat; + foreground-position: left 2px top 50%; + padding: 0.4em 1.75em 0.4em 1.1em; + margin: 0; +} + +menu li .menu-item-label +{ + width: *; + text-align: left; +} + +menu li:has-child-of-type(menu) caption +{ + width: *; + text-align: left; +} + +menu li:current caption, +menu li:hover:owns-popup caption +{ + color: #f0f0f0; +} + +menu li .menu-item-glyph +{ + width: 1.15em; + min-width: 1.15em; + max-width: 1.15em; + min-height: 1.15em; + max-height: 1.15em; + margin: 0 0.55em 0 0; + box-sizing: border-box; + display: inline-block; + vertical-align: middle; + flex-shrink: 0; + foreground-image: none; +} + +menu li .menu-item-glyph.menu-item-glyph-spacer +{ + border: 1.5px solid transparent; + border-radius: 3px; + position: relative; +} + +menu li .menu-item-glyph.menu-item-checkbox +{ + border: 1.5px solid var(--color-ui-text-muted, #8c8c8c); + border-radius: 3px; + position: relative; + foreground-image: none; +} + +menu li .menu-item-glyph.menu-item-checkbox.checked +{ + border-color: var(--color-ui-text-primary, #f0f0f0); +} + +menu li .menu-item-glyph.menu-item-icon-svg +{ + border: none; + width: 1.15em; + height: 1.15em; + min-width: 1.15em; + max-width: 1.15em; + padding: 0; +} + +menu li .menu-item-glyph.menu-item-icon-svg svg +{ + width: 1.05em; + height: 1.05em; + display: block; + vertical-align: middle; +} + +menu li .menu-item-glyph.menu-item-icon-svg path, +menu li .menu-item-glyph.menu-item-icon-svg circle +{ + fill: currentColor; +} + +menu li .menu-item-glyph.menu-item-icon-svg path[fill="none"], +menu li .menu-item-glyph.menu-item-icon-svg circle[fill="none"] +{ + fill: none; + stroke: currentColor; +} + +menu li .menu-item-glyph .menu-item-checkmark +{ + position: absolute; + left: 0; + top: 0; + width: *; + height: *; + text-align: center; + vertical-align: middle; + font-size: 0.72em; + line-height: 1.15em; + color: var(--color-ui-text-primary, #f0f0f0); +} + +menu li:current .menu-item-glyph.menu-item-checkbox, +menu li:hover:owns-popup .menu-item-glyph.menu-item-checkbox +{ + border-color: #f0f0f0; +} + +menu li:current .menu-item-glyph .menu-item-checkmark, +menu li:hover:owns-popup .menu-item-glyph .menu-item-checkmark +{ + color: #f0f0f0; +} + +menu li .menu-accelerator +{ + width: max-content; + margin-left: 2.5em; + white-space: nowrap; + text-align: right; + color: var(--color-menu-shortcut-text); +} + +menu li .menu-accelerator:empty +{ + display: none; + margin: 0; + width: 0; +} + +menu li:hover +{ + background: var(--color-menuitem-background-hover); + border-radius: 2px; +} + +menu li:current, +menu li:hover:owns-popup +{ + background-color: #094771; + border-radius: 2px; +} + +menu li:current .menu-item-label, +menu li:current .menu-accelerator, +menu li:hover:owns-popup .menu-item-label, +menu li:hover:owns-popup .menu-accelerator +{ + color: #f0f0f0; +} + +menu li:disabled +{ + color:graytext; + foreground-image: none; +} + +menu li:has-child-of-type(menu) +{ + foreground-image:url(stock:arrow-right); + foreground-repeat: no-repeat; + foreground-position: top 50% right 2px; +} + +menu li:has-child-of-type(menu):rtl +{ + foreground-image:url(stock:arrow-left); + foreground-repeat: no-repeat; + foreground-position: top 50% left 2px; +} + +menu hr +{ + display: block; + height: 1px; + margin: 0.4em 0.65em; + border: none; + background: var(--color-menu-separator); +} diff --git a/lang/english/html/about_dialog.html b/lang/english/html/about_dialog.html new file mode 100644 index 00000000..95c2425d --- /dev/null +++ b/lang/english/html/about_dialog.html @@ -0,0 +1,53 @@ + + + + + + About NXEmu + +
+ About NXEmu + + + +
+ +
+
+
+ +
+
+
NXEmu
+
+ +
+
+
+
+

NXEmu is an experimental open-source Nintendo Switch emulator.

+

You are responsible for ensuring your use of this software complies with the laws in your jurisdiction.

+
+
+
With thanks to
+
+ the yuzu project, Stardust, and NullVector +
+
+ +
+ "Nintendo Switch" is a trademark of Nintendo. NXEmu is not affiliated with Nintendo in any way. +
+
+
+ + + diff --git a/lang/english/html/input_config.html b/lang/english/html/input_config.html index 9c63da99..11573a4f 100644 --- a/lang/english/html/input_config.html +++ b/lang/english/html/input_config.html @@ -1,6 +1,7 @@ + Configure Input diff --git a/lang/english/html/system_config.html b/lang/english/html/system_config.html index 70a1a0d8..000e7e45 100644 --- a/lang/english/html/system_config.html +++ b/lang/english/html/system_config.html @@ -1,6 +1,7 @@ + NxEmu Configuration