Skip to content

Commit

Permalink
- Fix #52
Browse files Browse the repository at this point in the history
  • Loading branch information
OzymandiasTheGreat committed Feb 15, 2020
1 parent 24206b9 commit 1f3a890
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@
/out-tsc
/app-builds
/release
__pycache__
main.js
src/**/*.js
!src/karma.conf.js
*.js.map
*.pyc

# dependencies
/node_modules
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emoji-keyboard",
"version": "3.0.0rc0",
"version": "3.0.0rc1",
"description": "Type emoji easily! Virtual keyboard-like emoji palette for Linux with lots of features.",
"homepage": "https://github.com/OzymandiasTheGreat/emoji-keyboard",
"repository": "https://github.com/OzymandiasTheGreat/emoji-keyboard",
Expand Down Expand Up @@ -81,6 +81,7 @@
"@mdi/font": "4.9.95",
"custom-electron-titlebar": "3.2.2-hotfix62",
"ini": "1.3.5",
"npm-run-all": "4.1.5",
"object-observer": "2.5.2",
"python-shell": "1.0.8",
"spinkit": "2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "emoji-keyboard"
version = "3.0.0rc0"
version = "3.0.0rc1"
description = "Type emoji easily! Virtual keyboard-like emoji palette for Linux with lots of features."
authors = ["Ozymandias <tomas.rav@gmail.com>"]
license = "GPL-3.0-or-later"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name = 'emoji-keyboard',
version = '3.0.0rc0',
version = '3.0.0rc1',
description = 'Type emoji easily! Virtual keyboard-like emoji palette with lots of features.',
long_description = None,
author = 'Ozymandias (Tomas Ravinskas)',
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/settings/settings.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<mat-form-field>
<mat-select #skinTone color="accent" [value]="prefs.settings.skin_tone">
<mat-option *ngFor="let tone of skinTones" [value]="tone">
<img [src]="tonePath + tone + '.svg' | safeRes" alt="None">
<img [src]="join(tonePath, tone) | safeRes" alt="None">
</mat-option>
</mat-select>
</mat-form-field>
Expand Down
6 changes: 6 additions & 0 deletions src/app/components/settings/settings.component.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import * as path from "path";

import { Component, OnInit, AfterViewInit, Inject, ViewChild, ElementRef } from '@angular/core';

import { MatSelect } from "@angular/material/select";
Expand Down Expand Up @@ -70,4 +72,8 @@ export class SettingsComponent implements OnInit, AfterViewInit {
Object.assign(this.prefs.hotkeys, hotkeys);
this.prefs.save();
}

join(root: string, file: string): string {
return path.join(root, `${file}.svg`);
}
}

0 comments on commit 1f3a890

Please sign in to comment.