Compare commits

..

9 Commits

Author SHA1 Message Date
allcontributors[bot]
c36ccd5666 update README.de-DE.md [skip ci] 2023-10-09 11:07:36 +00:00
allcontributors[bot]
4575548aa0 update README.it-IT.md [skip ci] 2023-10-09 11:07:35 +00:00
allcontributors[bot]
0a2ec06a37 update README.ko-KR.md [skip ci] 2023-10-09 11:07:34 +00:00
allcontributors[bot]
c255c7c97b update README.ru-RU.md [skip ci] 2023-10-09 11:07:33 +00:00
allcontributors[bot]
b889e82739 update README.zh-CN.md [skip ci] 2023-10-09 11:07:32 +00:00
allcontributors[bot]
b998dc0c31 update README.md [skip ci] 2023-10-09 11:07:31 +00:00
Eugene
e68bd6c746 Merge pull request #9082 from Ranhiru/fix-not-showing-custom-profiles-in-settings 2023-10-09 13:07:28 +02:00
Jude Cooray
57f20eca4f Show option group only if there are custom profiles 2023-10-09 21:06:42 +11:00
Jude Cooray
5d1a35a285 Show custom profiles in default profiles selection 2023-10-09 20:29:06 +11:00
9 changed files with 22 additions and 17 deletions

View File

@@ -330,6 +330,7 @@ Dank geht an diese wunderbaren Menschen ([emoji key](https://allcontributors.org
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://siebsie23.nl/"><img src="https://avatars.githubusercontent.com/u/25083973?v=4?s=100" width="100px;" alt="Sibren"/><br /><sub><b>Sibren</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=siebsie23" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.nathaniel-walser.com"><img src="https://avatars.githubusercontent.com/u/33339996?v=4?s=100" width="100px;" alt="Nathaniel Walser"/><br /><sub><b>Nathaniel Walser</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=nwalser" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://stackoverflow.com/users/286204/ranhiru-cooray"><img src="https://avatars.githubusercontent.com/u/2367456?v=4?s=100" width="100px;" alt="Jude Cooray"/><br /><sub><b>Jude Cooray</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Ranhiru" title="Code">💻</a></td>
</tr>
</tbody>
</table>

View File

@@ -325,6 +325,7 @@ Grazie a queste persone meravigliose ([emoji key](https://allcontributors.org/do
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://siebsie23.nl/"><img src="https://avatars.githubusercontent.com/u/25083973?v=4?s=100" width="100px;" alt="Sibren"/><br /><sub><b>Sibren</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=siebsie23" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.nathaniel-walser.com"><img src="https://avatars.githubusercontent.com/u/33339996?v=4?s=100" width="100px;" alt="Nathaniel Walser"/><br /><sub><b>Nathaniel Walser</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=nwalser" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://stackoverflow.com/users/286204/ranhiru-cooray"><img src="https://avatars.githubusercontent.com/u/2367456?v=4?s=100" width="100px;" alt="Jude Cooray"/><br /><sub><b>Jude Cooray</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Ranhiru" title="Code">💻</a></td>
</tr>
</tbody>
</table>

View File

@@ -319,6 +319,7 @@ Pull requests and plugins are welcome!
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://siebsie23.nl/"><img src="https://avatars.githubusercontent.com/u/25083973?v=4?s=100" width="100px;" alt="Sibren"/><br /><sub><b>Sibren</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=siebsie23" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.nathaniel-walser.com"><img src="https://avatars.githubusercontent.com/u/33339996?v=4?s=100" width="100px;" alt="Nathaniel Walser"/><br /><sub><b>Nathaniel Walser</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=nwalser" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://stackoverflow.com/users/286204/ranhiru-cooray"><img src="https://avatars.githubusercontent.com/u/2367456?v=4?s=100" width="100px;" alt="Jude Cooray"/><br /><sub><b>Jude Cooray</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Ranhiru" title="Code">💻</a></td>
</tr>
</tbody>
</table>

View File

@@ -342,6 +342,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://siebsie23.nl/"><img src="https://avatars.githubusercontent.com/u/25083973?v=4?s=100" width="100px;" alt="Sibren"/><br /><sub><b>Sibren</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=siebsie23" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.nathaniel-walser.com"><img src="https://avatars.githubusercontent.com/u/33339996?v=4?s=100" width="100px;" alt="Nathaniel Walser"/><br /><sub><b>Nathaniel Walser</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=nwalser" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://stackoverflow.com/users/286204/ranhiru-cooray"><img src="https://avatars.githubusercontent.com/u/2367456?v=4?s=100" width="100px;" alt="Jude Cooray"/><br /><sub><b>Jude Cooray</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Ranhiru" title="Code">💻</a></td>
</tr>
</tbody>
</table>

View File

@@ -325,6 +325,7 @@ Pull-запросы и плагины приветствуются!
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://siebsie23.nl/"><img src="https://avatars.githubusercontent.com/u/25083973?v=4?s=100" width="100px;" alt="Sibren"/><br /><sub><b>Sibren</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=siebsie23" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.nathaniel-walser.com"><img src="https://avatars.githubusercontent.com/u/33339996?v=4?s=100" width="100px;" alt="Nathaniel Walser"/><br /><sub><b>Nathaniel Walser</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=nwalser" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://stackoverflow.com/users/286204/ranhiru-cooray"><img src="https://avatars.githubusercontent.com/u/2367456?v=4?s=100" width="100px;" alt="Jude Cooray"/><br /><sub><b>Jude Cooray</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Ranhiru" title="Code">💻</a></td>
</tr>
</tbody>
</table>

View File

@@ -324,6 +324,7 @@
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://siebsie23.nl/"><img src="https://avatars.githubusercontent.com/u/25083973?v=4?s=100" width="100px;" alt="Sibren"/><br /><sub><b>Sibren</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=siebsie23" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.nathaniel-walser.com"><img src="https://avatars.githubusercontent.com/u/33339996?v=4?s=100" width="100px;" alt="Nathaniel Walser"/><br /><sub><b>Nathaniel Walser</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=nwalser" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://stackoverflow.com/users/286204/ranhiru-cooray"><img src="https://avatars.githubusercontent.com/u/2367456?v=4?s=100" width="100px;" alt="Jude Cooray"/><br /><sub><b>Jude Cooray</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Ranhiru" title="Code">💻</a></td>
</tr>
</tbody>
</table>

View File

@@ -7,11 +7,6 @@
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
"@colors/colors@^1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0"
integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==
"@dabh/diagnostics@^2.0.2":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31"
@@ -530,11 +525,11 @@ winston-transport@^4.5.0:
triple-beam "^1.3.0"
winston@^3.3.3:
version "3.11.0"
resolved "https://registry.yarnpkg.com/winston/-/winston-3.11.0.tgz#2d50b0a695a2758bb1c95279f0a88e858163ed91"
integrity sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g==
version "3.9.0"
resolved "https://registry.yarnpkg.com/winston/-/winston-3.9.0.tgz#2bbdeb8167a75fac6d9a0c6d002890cd908016c2"
integrity sha512-jW51iW/X95BCW6MMtZWr2jKQBP4hV5bIDq9QrIjfDk6Q9QuxvTKEAlpUNAzP+HYHFFCeENhph16s0zEunu4uuQ==
dependencies:
"@colors/colors" "^1.6.0"
"@colors/colors" "1.5.0"
"@dabh/diagnostics" "^2.0.2"
async "^3.2.3"
is-stream "^2.0.0"

View File

@@ -12,14 +12,16 @@ ul.nav-tabs(ngbNav, #nav='ngbNav')
[(ngModel)]='config.store.terminal.profile',
(ngModelChange)='config.save()',
)
option(
*ngFor='let profile of profiles',
[ngValue]='profile.id'
) {{profile.name}}
option(
*ngFor='let profile of builtinProfiles',
[ngValue]='profile.id'
) {{profile.name}}
optgroup([label]='"Custom Profiles"|translate', *ngIf='customProfiles?.length > 0')
option(
*ngFor='let profile of customProfiles',
[ngValue]='profile.id'
) {{profile.name}}
optgroup([label]='"Built-in Profiles"|translate')
option(
*ngFor='let profile of builtinProfiles',
[ngValue]='profile.id'
) {{profile.name}}
.d-flex.mb-3
.input-group

View File

@@ -21,6 +21,7 @@ interface CollapsableProfileGroup extends ProfileGroup {
export class ProfilesSettingsTabComponent extends BaseComponent {
builtinProfiles: PartialProfile<Profile>[] = []
templateProfiles: PartialProfile<Profile>[] = []
customProfiles: PartialProfile<Profile>[] = []
profileGroups: PartialProfileGroup<CollapsableProfileGroup>[]
filter = ''
Platform = Platform
@@ -42,6 +43,7 @@ export class ProfilesSettingsTabComponent extends BaseComponent {
async ngOnInit (): Promise<void> {
this.refresh()
this.builtinProfiles = (await this.profilesService.getProfiles()).filter(x => x.isBuiltin)
this.customProfiles = (await this.profilesService.getProfiles()).filter(x => !x.isBuiltin)
this.templateProfiles = this.builtinProfiles.filter(x => x.isTemplate)
this.builtinProfiles = this.builtinProfiles.filter(x => !x.isTemplate)
this.refresh()