renaming config-serializer upper camel case file names to dash case (#320)

* renaming: config-serializer upper camel case file names to dash case (closes #305)

* fix: remove then add same source with lowercase

* fix: d.ts file with lowercase
This commit is contained in:
Attila Csanyi
2017-06-27 09:41:07 +02:00
committed by László Monda
parent 121807a65a
commit 22a59160fb
64 changed files with 122 additions and 123 deletions
@@ -9,8 +9,8 @@ import 'rxjs/add/operator/first';
import 'rxjs/add/operator/map'; import 'rxjs/add/operator/map';
import 'rxjs/add/operator/switchMap'; import 'rxjs/add/operator/switchMap';
import { Keymap } from '../../../shared/config-serializer/config-items/Keymap'; import { Keymap } from '../../../shared/config-serializer/config-items/keymap';
import { UhkBuffer } from '../../../shared/config-serializer/UhkBuffer'; import { UhkBuffer } from '../../../shared/config-serializer/uhk-buffer';
import { AppState } from '../../../shared/store'; import { AppState } from '../../../shared/store';
import { SvgKeyboardWrapComponent } from '../../../shared/components/svg/wrap'; import { SvgKeyboardWrapComponent } from '../../../shared/components/svg/wrap';
import { KeymapEditComponent as SharedKeymapEditComponent } from '../../../shared/components/keymap/edit'; import { KeymapEditComponent as SharedKeymapEditComponent } from '../../../shared/components/keymap/edit';
+1 -1
View File
@@ -10,7 +10,7 @@ import 'rxjs/add/operator/takeWhile';
import { AppState } from '../shared/store'; import { AppState } from '../shared/store';
import { getUserConfiguration } from '../shared/store/reducers/user-configuration'; import { getUserConfiguration } from '../shared/store/reducers/user-configuration';
import { UhkBuffer } from '../shared/config-serializer/UhkBuffer'; import { UhkBuffer } from '../shared/config-serializer/uhk-buffer';
import { UhkDeviceService } from '../services/uhk-device.service'; import { UhkDeviceService } from '../services/uhk-device.service';
@@ -1,6 +1,6 @@
import * as storage from 'electron-settings'; import * as storage from 'electron-settings';
import { UserConfiguration } from '../shared/config-serializer/config-items/UserConfiguration'; import { UserConfiguration } from '../shared/config-serializer/config-items/user-configuration';
import { DataStorageRepositoryService } from '../shared/services/datastorage-repository.service'; import { DataStorageRepositoryService } from '../shared/services/datastorage-repository.service';
import { AutoUpdateSettings } from '../shared/models/auto-update-settings'; import { AutoUpdateSettings } from '../shared/models/auto-update-settings';
+2 -2
View File
@@ -23,8 +23,8 @@ import 'rxjs/add/operator/switchMap';
import { Device, Interface, InEndpoint, OutEndpoint, findByIds, on } from 'usb'; import { Device, Interface, InEndpoint, OutEndpoint, findByIds, on } from 'usb';
import { Layer } from '../shared/config-serializer/config-items/Layer'; import { Layer } from '../shared/config-serializer/config-items/layer';
import { UhkBuffer } from '../shared/config-serializer/UhkBuffer'; import { UhkBuffer } from '../shared/config-serializer/uhk-buffer';
const vendorId = 0x1d50; const vendorId = 0x1d50;
const productId = 0x6122; const productId = 0x6122;
@@ -3,7 +3,7 @@ import {
} from '@angular/core'; } from '@angular/core';
import { animate, keyframes, state, style, transition, trigger } from '@angular/animations'; import { animate, keyframes, state, style, transition, trigger } from '@angular/animations';
import { Layer } from '../../../config-serializer/config-items/Layer'; import { Layer } from '../../../config-serializer/config-items/layer';
type AnimationKeyboard = type AnimationKeyboard =
'leftIn' | 'leftIn' |
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs/Observable';
import 'rxjs/add/operator/combineLatest'; import 'rxjs/add/operator/combineLatest';
import 'rxjs/add/operator/publishReplay'; import 'rxjs/add/operator/publishReplay';
import { Keymap } from '../../../config-serializer/config-items/Keymap'; import { Keymap } from '../../../config-serializer/config-items/keymap';
import { AppState } from '../../../store'; import { AppState } from '../../../store';
import { KeymapActions } from '../../../store/actions'; import { KeymapActions } from '../../../store/actions';
@@ -10,7 +10,7 @@ import 'rxjs/add/operator/switchMap';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { Keymap } from './../../../config-serializer/config-items/Keymap'; import { Keymap } from './../../../config-serializer/config-items/keymap';
import { AppState } from '../../../store/index'; import { AppState } from '../../../store/index';
import { getKeymaps } from '../../../store/reducers/user-configuration'; import { getKeymaps } from '../../../store/reducers/user-configuration';
@@ -13,7 +13,7 @@ import 'rxjs/add/operator/switchMap';
import { saveAs } from 'file-saver'; import { saveAs } from 'file-saver';
import { Keymap } from '../../../config-serializer/config-items/Keymap'; import { Keymap } from '../../../config-serializer/config-items/keymap';
import { AppState } from '../../../store'; import { AppState } from '../../../store';
import { getKeymap, getKeymaps, getUserConfiguration } from '../../../store/reducers/user-configuration'; import { getKeymap, getKeymaps, getUserConfiguration } from '../../../store/reducers/user-configuration';
@@ -13,7 +13,7 @@ import {
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { Keymap } from '../../../config-serializer/config-items/Keymap'; import { Keymap } from '../../../config-serializer/config-items/keymap';
import { AppState } from '../../../store'; import { AppState } from '../../../store';
import { KeymapActions } from '../../../store/actions'; import { KeymapActions } from '../../../store/actions';
@@ -5,8 +5,8 @@ import { Store } from '@ngrx/store';
import { Subscription } from 'rxjs/Subscription'; import { Subscription } from 'rxjs/Subscription';
import { Macro } from '../../../config-serializer/config-items/Macro'; import { Macro } from '../../../config-serializer/config-items/macro';
import { MacroAction } from '../../../config-serializer/config-items/macro-action/MacroAction'; import { MacroAction } from '../../../config-serializer/config-items/macro-action/macro-action';
import { MacroActions } from '../../../store/actions'; import { MacroActions } from '../../../store/actions';
import { AppState } from '../../../store/index'; import { AppState } from '../../../store/index';
@@ -5,7 +5,7 @@ import {
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { Macro } from '../../../config-serializer/config-items/Macro'; import { Macro } from '../../../config-serializer/config-items/macro';
import { MacroActions } from '../../../store/actions'; import { MacroActions } from '../../../store/actions';
import { AppState } from '../../../store/index'; import { AppState } from '../../../store/index';
@@ -1,7 +1,7 @@
import { Component, Input, Output, EventEmitter, OnChanges, OnInit, SimpleChanges } from '@angular/core'; import { Component, Input, Output, EventEmitter, OnChanges, OnInit, SimpleChanges } from '@angular/core';
import { animate, state, style, transition, trigger } from '@angular/animations'; import { animate, state, style, transition, trigger } from '@angular/animations';
import { KeyModifiers } from '../../../config-serializer/config-items/KeyModifiers'; import { KeyModifiers } from '../../../config-serializer/config-items/key-modifiers';
import { import {
DelayMacroAction, DelayMacroAction,
KeyMacroAction, KeyMacroAction,
@@ -3,7 +3,7 @@ import { animate, state, style, transition, trigger } from '@angular/animations'
import { DragulaService } from 'ng2-dragula/ng2-dragula'; import { DragulaService } from 'ng2-dragula/ng2-dragula';
import { Macro } from '../../../config-serializer/config-items/Macro'; import { Macro } from '../../../config-serializer/config-items/macro';
import { MacroAction } from '../../../config-serializer/config-items/macro-action'; import { MacroAction } from '../../../config-serializer/config-items/macro-action';
import { MacroItemComponent } from './../index'; import { MacroItemComponent } from './../index';
@@ -10,7 +10,7 @@ import { Store } from '@ngrx/store';
import { AppState } from '../../../store/index'; import { AppState } from '../../../store/index';
import { getMacros } from '../../../store/reducers/user-configuration'; import { getMacros } from '../../../store/reducers/user-configuration';
import { Macro } from './../../../config-serializer/config-items/Macro'; import { Macro } from './../../../config-serializer/config-items/macro';
@Injectable() @Injectable()
export class MacroNotFoundGuard implements CanActivate { export class MacroNotFoundGuard implements CanActivate {
@@ -16,7 +16,7 @@ import {
SwitchKeymapAction, SwitchKeymapAction,
SwitchLayerAction SwitchLayerAction
} from '../../config-serializer/config-items/key-action'; } from '../../config-serializer/config-items/key-action';
import { Keymap } from '../../config-serializer/config-items/Keymap'; import { Keymap } from '../../config-serializer/config-items/keymap';
import { Tab } from './tab/tab'; import { Tab } from './tab/tab';
@@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit } from '@a
import { Select2OptionData } from 'ng2-select2/ng2-select2'; import { Select2OptionData } from 'ng2-select2/ng2-select2';
import { KeyAction, SwitchKeymapAction } from '../../../../config-serializer/config-items/key-action'; import { KeyAction, SwitchKeymapAction } from '../../../../config-serializer/config-items/key-action';
import { Keymap } from '../../../../config-serializer/config-items/Keymap'; import { Keymap } from '../../../../config-serializer/config-items/keymap';
import { Tab } from '../tab'; import { Tab } from '../tab';
@Component({ @Component({
@@ -7,7 +7,7 @@ import { Subscription } from 'rxjs/Subscription';
import { Select2OptionData } from 'ng2-select2/ng2-select2'; import { Select2OptionData } from 'ng2-select2/ng2-select2';
import { KeyAction, PlayMacroAction } from '../../../../config-serializer/config-items/key-action'; import { KeyAction, PlayMacroAction } from '../../../../config-serializer/config-items/key-action';
import { Macro } from '../../../../config-serializer/config-items/Macro'; import { Macro } from '../../../../config-serializer/config-items/macro';
import { Tab } from '../tab'; import { Tab } from '../tab';
@@ -8,8 +8,8 @@ import 'rxjs/add/operator/do';
import 'rxjs/add/operator/map'; import 'rxjs/add/operator/map';
import 'rxjs/add/operator/let'; import 'rxjs/add/operator/let';
import { Keymap } from '../../config-serializer/config-items/Keymap'; import { Keymap } from '../../config-serializer/config-items/keymap';
import { Macro } from '../../config-serializer/config-items/Macro'; import { Macro } from '../../config-serializer/config-items/macro';
import { AppState } from '../../store'; import { AppState } from '../../store';
import { MacroActions } from '../../store/actions'; import { MacroActions } from '../../store/actions';
@@ -1,7 +1,7 @@
import { Component, EventEmitter, Input, OnInit, Output, SimpleChanges, ChangeDetectionStrategy } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output, SimpleChanges, ChangeDetectionStrategy } from '@angular/core';
import { animate, state, trigger, style, transition } from '@angular/animations'; import { animate, state, trigger, style, transition } from '@angular/animations';
import { Module } from '../../../config-serializer/config-items/Module'; import { Module } from '../../../config-serializer/config-items/module';
import { SvgModule } from '../module'; import { SvgModule } from '../module';
import { SvgModuleProviderService } from '../../../services/svg-module-provider.service'; import { SvgModuleProviderService } from '../../../services/svg-module-provider.service';
@@ -17,8 +17,8 @@ import {
SwitchKeymapAction, SwitchKeymapAction,
SwitchLayerAction SwitchLayerAction
} from '../../../../config-serializer/config-items/key-action'; } from '../../../../config-serializer/config-items/key-action';
import { KeyModifiers } from '../../../../config-serializer/config-items/KeyModifiers'; import { KeyModifiers } from '../../../../config-serializer/config-items/key-modifiers';
import { Macro } from '../../../../config-serializer/config-items/Macro'; import { Macro } from '../../../../config-serializer/config-items/macro';
import { CaptureService } from '../../../../services/capture.service'; import { CaptureService } from '../../../../services/capture.service';
import { MapperService } from '../../../../services/mapper.service'; import { MapperService } from '../../../../services/mapper.service';
@@ -1,7 +1,7 @@
import { Component, Input, OnChanges, OnInit, ChangeDetectionStrategy } from '@angular/core'; import { Component, Input, OnChanges, OnInit, ChangeDetectionStrategy } from '@angular/core';
import { KeystrokeAction } from '../../../../config-serializer/config-items/key-action'; import { KeystrokeAction } from '../../../../config-serializer/config-items/key-action';
import { KeyModifiers } from '../../../../config-serializer/config-items/KeyModifiers'; import { KeyModifiers } from '../../../../config-serializer/config-items/key-modifiers';
import { MapperService } from '../../../../services/mapper.service'; import { MapperService } from '../../../../services/mapper.service';
class SvgAttributes { class SvgAttributes {
@@ -31,9 +31,9 @@ import {
SwitchKeymapAction, SwitchKeymapAction,
SwitchLayerAction SwitchLayerAction
} from '../../../config-serializer/config-items/key-action'; } from '../../../config-serializer/config-items/key-action';
import { Keymap } from '../../../config-serializer/config-items/Keymap'; import { Keymap } from '../../../config-serializer/config-items/keymap';
import { Layer } from '../../../config-serializer/config-items/Layer'; import { Layer } from '../../../config-serializer/config-items/layer';
import { LongPressAction } from '../../../config-serializer/config-items/LongPressAction'; import { LongPressAction } from '../../../config-serializer/config-items/long-press-action';
import { camelCaseToSentence, capitalizeFirstLetter } from '../../../util'; import { camelCaseToSentence, capitalizeFirstLetter } from '../../../util';
import { AppState } from '../../../store'; import { AppState } from '../../../store';
@@ -1,5 +1,5 @@
import { assertUInt8, assertUInt32 } from '../assert'; import { assertUInt8, assertUInt32 } from '../assert';
import { UhkBuffer } from '../UhkBuffer'; import { UhkBuffer } from '../uhk-buffer';
export class HardwareConfiguration { export class HardwareConfiguration {
@@ -1,4 +1,4 @@
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { import {
KeyAction, KeyAction,
KeyActionId, KeyActionId,
@@ -10,7 +10,7 @@ import {
keyActionType keyActionType
} from './index'; } from './index';
import { Macro } from '../Macro'; import { Macro } from '../macro';
export class Helper { export class Helper {
@@ -1,8 +1,8 @@
export * from './KeyAction'; export * from './key-action';
export * from './KeystrokeAction'; export * from './keystroke-action';
export * from './MouseAction'; export * from './mouse-action';
export * from './NoneAction'; export * from './none-action';
export * from './PlayMacroAction'; export * from './play-macro-action';
export * from './SwitchKeymapAction'; export * from './switch-keymap-action';
export * from './SwitchLayerAction'; export * from './switch-layer-action';
export * from './helper'; export * from './helper';
@@ -1,7 +1,7 @@
/// <reference path="../../Function.d.ts" /> /// <reference path="../../function.d.ts" />
import { Macro } from '../Macro'; import { Macro } from '../macro';
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
export enum KeyActionId { export enum KeyActionId {
NoneAction = 0, NoneAction = 0,
@@ -1,8 +1,8 @@
import { assertEnum, assertUInt8 } from '../../assert'; import { assertEnum, assertUInt8 } from '../../assert';
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { KeyModifiers } from '../KeyModifiers'; import { KeyModifiers } from '../key-modifiers';
import { LongPressAction } from '../LongPressAction'; import { LongPressAction } from '../long-press-action';
import { KeyAction, KeyActionId, keyActionType } from './KeyAction'; import { KeyAction, KeyActionId, keyActionType } from './key-action';
import { KeystrokeType } from './keystroke-type'; import { KeystrokeType } from './keystroke-type';
export enum KeystrokeActionFlag { export enum KeystrokeActionFlag {
@@ -1,6 +1,6 @@
import { assertEnum } from '../../assert'; import { assertEnum } from '../../assert';
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { KeyAction, KeyActionId, keyActionType } from './KeyAction'; import { KeyAction, KeyActionId, keyActionType } from './key-action';
export enum MouseActionParam { export enum MouseActionParam {
leftClick, leftClick,
@@ -1,5 +1,5 @@
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { KeyAction, KeyActionId, keyActionType } from './KeyAction'; import { KeyAction, KeyActionId, keyActionType } from './key-action';
/** /**
* NoneAction is only intended for binary serialization of undefined key actions * NoneAction is only intended for binary serialization of undefined key actions
@@ -1,7 +1,7 @@
import { assertUInt8 } from '../../assert'; import { assertUInt8 } from '../../assert';
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { Macro } from '../Macro'; import { Macro } from '../macro';
import { KeyAction, KeyActionId, keyActionType } from './KeyAction'; import { KeyAction, KeyActionId, keyActionType } from './key-action';
export class PlayMacroAction extends KeyAction { export class PlayMacroAction extends KeyAction {
@@ -1,6 +1,6 @@
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { Keymap } from '../Keymap'; import { Keymap } from '../keymap';
import { KeyAction, KeyActionId, keyActionType } from './KeyAction'; import { KeyAction, KeyActionId, keyActionType } from './key-action';
export class SwitchKeymapAction extends KeyAction { export class SwitchKeymapAction extends KeyAction {
@@ -1,6 +1,6 @@
import { assertEnum } from '../../assert'; import { assertEnum } from '../../assert';
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { KeyAction, KeyActionId, keyActionType } from './KeyAction'; import { KeyAction, KeyActionId, keyActionType } from './key-action';
export enum LayerName { export enum LayerName {
mod, mod,
@@ -1,6 +1,6 @@
import { UhkBuffer } from '../UhkBuffer'; import { UhkBuffer } from '../uhk-buffer';
import { Layer } from './Layer'; import { Layer } from './layer';
import { Macro } from './Macro'; import { Macro } from './macro';
import { SwitchLayerAction, KeyAction } from './key-action'; import { SwitchLayerAction, KeyAction } from './key-action';
export class Keymap { export class Keymap {
@@ -1,6 +1,6 @@
import { UhkBuffer } from '../UhkBuffer'; import { UhkBuffer } from '../uhk-buffer';
import { Macro } from './Macro'; import { Macro } from './macro';
import { Module } from './Module'; import { Module } from './module';
export class Layer { export class Layer {
@@ -1,6 +1,6 @@
import { assertUInt16 } from '../../assert'; import { assertUInt16 } from '../../assert';
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { MacroAction, MacroActionId, macroActionType } from './MacroAction'; import { MacroAction, MacroActionId, macroActionType } from './macro-action';
export class DelayMacroAction extends MacroAction { export class DelayMacroAction extends MacroAction {
@@ -1,11 +1,11 @@
import { KeyAction, KeystrokeAction, keyActionType } from '../key-action'; import { KeyAction, KeystrokeAction, keyActionType } from '../key-action';
import { DelayMacroAction } from './DelayMacroAction'; import { DelayMacroAction } from './delay-macro-action';
import { KeyMacroAction } from './KeyMacroAction'; import { KeyMacroAction } from './key-macro-action';
import { MacroAction, MacroSubAction, macroActionType } from './MacroAction'; import { MacroAction, MacroSubAction, macroActionType } from './macro-action';
import { MouseButtonMacroAction } from './MouseButtonMacroAction'; import { MouseButtonMacroAction } from './mouse-button-macro-action';
import { MoveMouseMacroAction } from './MoveMouseMacroAction'; import { MoveMouseMacroAction } from './move-mouse-macro-action';
import { ScrollMouseMacroAction } from './ScrollMouseMacroAction'; import { ScrollMouseMacroAction } from './scroll-mouse-macro-action';
import { TextMacroAction } from './TextMacroAction'; import { TextMacroAction } from './text-macro-action';
interface JsObjectEditableMacroAction { interface JsObjectEditableMacroAction {
macroActionType: string; macroActionType: string;
@@ -1,4 +1,4 @@
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { import {
DelayMacroAction, DelayMacroAction,
KeyMacroAction, KeyMacroAction,
@@ -1,9 +1,9 @@
export * from './DelayMacroAction'; export * from './delay-macro-action';
export * from './EditableMacroAction'; export * from './editable-macro-action';
export * from './KeyMacroAction'; export * from './key-macro-action';
export * from './MacroAction'; export * from './macro-action';
export * from './MoveMouseMacroAction'; export * from './move-mouse-macro-action';
export * from './MouseButtonMacroAction'; export * from './mouse-button-macro-action';
export * from './ScrollMouseMacroAction'; export * from './scroll-mouse-macro-action';
export * from './TextMacroAction'; export * from './text-macro-action';
export * from './helper'; export * from './helper';
@@ -1,7 +1,7 @@
import { assertEnum, assertUInt8 } from '../../assert'; import { assertEnum, assertUInt8 } from '../../assert';
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { KeyModifiers } from '../KeyModifiers'; import { KeyModifiers } from '../key-modifiers';
import { MacroAction, MacroActionId, MacroSubAction, macroActionType } from './MacroAction'; import { MacroAction, MacroActionId, MacroSubAction, macroActionType } from './macro-action';
const NUM_OF_COMBINATIONS = 3; // Cases: scancode, modifer, both const NUM_OF_COMBINATIONS = 3; // Cases: scancode, modifer, both
@@ -1,4 +1,4 @@
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
export enum MacroActionId { export enum MacroActionId {
KeyMacroAction = 0, KeyMacroAction = 0,
@@ -1,6 +1,6 @@
import { assertEnum, assertUInt8 } from '../../assert'; import { assertEnum, assertUInt8 } from '../../assert';
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { MacroAction, MacroActionId, MacroSubAction, macroActionType } from './MacroAction'; import { MacroAction, MacroActionId, MacroSubAction, macroActionType } from './macro-action';
export enum MouseButtons { export enum MouseButtons {
Left = 1 << 0, Left = 1 << 0,
@@ -1,6 +1,6 @@
import { assertInt16 } from '../../assert'; import { assertInt16 } from '../../assert';
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { MacroAction, MacroActionId, macroActionType } from './MacroAction'; import { MacroAction, MacroActionId, macroActionType } from './macro-action';
export class MoveMouseMacroAction extends MacroAction { export class MoveMouseMacroAction extends MacroAction {
@@ -1,6 +1,6 @@
import { assertInt16 } from '../../assert'; import { assertInt16 } from '../../assert';
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { MacroAction, MacroActionId, macroActionType } from './MacroAction'; import { MacroAction, MacroActionId, macroActionType } from './macro-action';
export class ScrollMouseMacroAction extends MacroAction { export class ScrollMouseMacroAction extends MacroAction {
@@ -1,5 +1,5 @@
import { UhkBuffer } from '../../UhkBuffer'; import { UhkBuffer } from '../../uhk-buffer';
import { MacroAction, MacroActionId, macroActionType } from './MacroAction'; import { MacroAction, MacroActionId, macroActionType } from './macro-action';
export class TextMacroAction extends MacroAction { export class TextMacroAction extends MacroAction {
@@ -1,5 +1,5 @@
import { assertUInt8 } from '../assert'; import { assertUInt8 } from '../assert';
import { UhkBuffer } from '../UhkBuffer'; import { UhkBuffer } from '../uhk-buffer';
import { Helper as MacroActionHelper, MacroAction } from './macro-action'; import { Helper as MacroActionHelper, MacroAction } from './macro-action';
export class Macro { export class Macro {
@@ -1,5 +1,5 @@
import { assertUInt8 } from '../assert'; import { assertUInt8 } from '../assert';
import { UhkBuffer } from '../UhkBuffer'; import { UhkBuffer } from '../uhk-buffer';
export class ModuleConfiguration { export class ModuleConfiguration {
@@ -1,8 +1,7 @@
import { assertEnum, assertUInt8 } from '../assert'; import { assertEnum, assertUInt8 } from '../assert';
import { UhkBuffer } from '../UhkBuffer'; import { UhkBuffer } from '../uhk-buffer';
import { Helper as KeyActionHelper, KeyAction, NoneAction } from './key-action'; import { Helper as KeyActionHelper, KeyAction, NoneAction, PlayMacroAction, SwitchKeymapAction } from './key-action';
import { Macro } from './Macro'; import { Macro } from './macro';
import { PlayMacroAction, SwitchKeymapAction } from './key-action';
enum PointerRole { enum PointerRole {
none, none,
@@ -1,8 +1,8 @@
import { assertUInt16 } from '../assert'; import { assertUInt16 } from '../assert';
import { UhkBuffer } from '../UhkBuffer'; import { UhkBuffer } from '../uhk-buffer';
import { Keymap } from './Keymap'; import { Keymap } from './keymap';
import { Macro } from './Macro'; import { Macro } from './macro';
import { ModuleConfiguration } from './ModuleConfiguration'; import { ModuleConfiguration } from './module-configuration';
export class UserConfiguration { export class UserConfiguration {
@@ -1,6 +1,6 @@
import { InjectionToken } from '@angular/core'; import { InjectionToken } from '@angular/core';
import { UserConfiguration } from '../config-serializer/config-items/UserConfiguration'; import { UserConfiguration } from '../config-serializer/config-items/user-configuration';
import { AutoUpdateSettings } from '../models/auto-update-settings'; import { AutoUpdateSettings } from '../models/auto-update-settings';
export interface DataStorageRepositoryService { export interface DataStorageRepositoryService {
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { UserConfiguration } from '../config-serializer/config-items/UserConfiguration'; import { UserConfiguration } from '../config-serializer/config-items/user-configuration';
@Injectable() @Injectable()
export class DefaultUserConfigurationService { export class DefaultUserConfigurationService {
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { UserConfiguration } from '../config-serializer/config-items/UserConfiguration'; import { UserConfiguration } from '../config-serializer/config-items/user-configuration';
import { DataStorageRepositoryService } from './datastorage-repository.service'; import { DataStorageRepositoryService } from './datastorage-repository.service';
import { State as AutoUpdateSettings } from '../store/reducers/auto-update-settings'; import { State as AutoUpdateSettings } from '../store/reducers/auto-update-settings';
+2 -2
View File
@@ -1,8 +1,8 @@
import { Action } from '@ngrx/store'; import { Action } from '@ngrx/store';
import { KeyAction } from '../../config-serializer/config-items/key-action'; import { KeyAction } from '../../config-serializer/config-items/key-action';
import { Keymap } from '../../config-serializer/config-items/Keymap'; import { Keymap } from '../../config-serializer/config-items/keymap';
import { Macro } from '../../config-serializer/config-items/Macro'; import { Macro } from '../../config-serializer/config-items/macro';
export namespace KeymapActions { export namespace KeymapActions {
export const PREFIX = '[Keymap] '; export const PREFIX = '[Keymap] ';
+1 -1
View File
@@ -1,6 +1,6 @@
import { Action } from '@ngrx/store'; import { Action } from '@ngrx/store';
import { Macro } from '../../config-serializer/config-items/Macro'; import { Macro } from '../../config-serializer/config-items/macro';
import { MacroAction } from '../../config-serializer/config-items/macro-action'; import { MacroAction } from '../../config-serializer/config-items/macro-action';
export namespace MacroActions { export namespace MacroActions {
+1 -1
View File
@@ -1,7 +1,7 @@
import { Action } from '@ngrx/store'; import { Action } from '@ngrx/store';
import { type } from '../../util'; import { type } from '../../util';
import { UserConfiguration } from '../../config-serializer/config-items/UserConfiguration'; import { UserConfiguration } from '../../config-serializer/config-items/user-configuration';
const PREFIX = '[user-config] '; const PREFIX = '[user-config] ';
+1 -1
View File
@@ -15,7 +15,7 @@ import 'rxjs/add/observable/of';
import { KeymapActions } from '../actions'; import { KeymapActions } from '../actions';
import { AppState } from '../index'; import { AppState } from '../index';
import { Keymap } from '../../config-serializer/config-items/Keymap'; import { Keymap } from '../../config-serializer/config-items/keymap';
@Injectable() @Injectable()
export class KeymapEffects { export class KeymapEffects {
+1 -1
View File
@@ -16,7 +16,7 @@ import {
SaveUserConfigSuccessAction SaveUserConfigSuccessAction
} from '../actions/user-config'; } from '../actions/user-config';
import { UserConfiguration } from '../../config-serializer/config-items/UserConfiguration'; import { UserConfiguration } from '../../config-serializer/config-items/user-configuration';
import { DATA_STORAGE_REPOSITORY, DataStorageRepositoryService } from '../../services/datastorage-repository.service'; import { DATA_STORAGE_REPOSITORY, DataStorageRepositoryService } from '../../services/datastorage-repository.service';
import { DefaultUserConfigurationService } from '../../services/default-user-configuration.service'; import { DefaultUserConfigurationService } from '../../services/default-user-configuration.service';
import { AppState, getUserConfiguration } from '../index'; import { AppState, getUserConfiguration } from '../index';
+2 -2
View File
@@ -1,7 +1,7 @@
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { Keymap } from '../config-serializer/config-items/Keymap'; import { Keymap } from '../config-serializer/config-items/keymap';
import { UserConfiguration } from '../config-serializer/config-items/UserConfiguration'; import { UserConfiguration } from '../config-serializer/config-items/user-configuration';
import * as autoUpdate from './reducers/auto-update-settings'; import * as autoUpdate from './reducers/auto-update-settings';
// State interface for the application // State interface for the application
+1 -1
View File
@@ -1,6 +1,6 @@
import { Action } from '@ngrx/store'; import { Action } from '@ngrx/store';
import { Keymap } from '../../config-serializer/config-items/Keymap'; import { Keymap } from '../../config-serializer/config-items/keymap';
import { KeymapActions } from '../actions/keymap'; import { KeymapActions } from '../actions/keymap';
const initialState: Keymap[] = []; const initialState: Keymap[] = [];
@@ -6,11 +6,11 @@ import 'rxjs/add/observable/of';
import 'rxjs/add/operator/map'; import 'rxjs/add/operator/map';
import { Helper as KeyActionHelper, KeyAction } from '../../config-serializer/config-items/key-action'; import { Helper as KeyActionHelper, KeyAction } from '../../config-serializer/config-items/key-action';
import { Keymap } from '../../config-serializer/config-items/Keymap'; import { Keymap } from '../../config-serializer/config-items/keymap';
import { Macro } from '../../config-serializer/config-items/Macro'; import { Macro } from '../../config-serializer/config-items/macro';
import { UserConfiguration } from '../../config-serializer/config-items/UserConfiguration'; import { UserConfiguration } from '../../config-serializer/config-items/user-configuration';
import { Layer } from '../../config-serializer/config-items/Layer'; import { Layer } from '../../config-serializer/config-items/layer';
import { Module } from '../../config-serializer/config-items/Module'; import { Module } from '../../config-serializer/config-items/module';
import { KeymapActions, MacroActions } from '../actions'; import { KeymapActions, MacroActions } from '../actions';
import { AppState } from '../index'; import { AppState } from '../index';
import { ActionTypes } from '../actions/user-config'; import { ActionTypes } from '../actions/user-config';
+2 -2
View File
@@ -1,5 +1,5 @@
import { UserConfiguration } from '../shared/src/config-serializer/config-items/UserConfiguration'; import { UserConfiguration } from '../shared/src/config-serializer/config-items/user-configuration';
import { UhkBuffer } from '../shared/src/config-serializer/UhkBuffer'; import { UhkBuffer } from '../shared/src/config-serializer/uhk-buffer';
const assert = require('assert'); const assert = require('assert');
const fs = require('fs'); const fs = require('fs');