diff --git a/.gitignore b/.gitignore index bd9d24158..8e6752e7c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,10 +8,12 @@ /out-tsc /app-builds /release +__pycache__ main.js src/**/*.js !src/karma.conf.js *.js.map +*.pyc # dependencies /node_modules diff --git a/package.json b/package.json index daa6c72d1..589bd01ba 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", diff --git a/pyproject.toml b/pyproject.toml index bcdf97046..e37ca2fdc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 "] license = "GPL-3.0-or-later" diff --git a/setup.py b/setup.py index 9e0b30b3b..3c76040c2 100755 --- a/setup.py +++ b/setup.py @@ -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)', diff --git a/src/app/components/settings/settings.component.html b/src/app/components/settings/settings.component.html index d9870c153..f9fe25842 100644 --- a/src/app/components/settings/settings.component.html +++ b/src/app/components/settings/settings.component.html @@ -42,7 +42,7 @@ - None + None diff --git a/src/app/components/settings/settings.component.ts b/src/app/components/settings/settings.component.ts index ffbe4cd5e..9bce475ba 100644 --- a/src/app/components/settings/settings.component.ts +++ b/src/app/components/settings/settings.component.ts @@ -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"; @@ -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`); + } }