Macro UI #87
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,3 +4,5 @@ npm-debug.log | |
| dist | ||
| .idea | ||
| *.iml | ||
| *.sublime-project | ||
| *.sublime-workspace | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| export * from './macro.component'; | ||
| export * from './macro.routes'; | ||
| export * from './macro-item'; | ||
| export * from './macro-action-editor'; | ||
| export * from './macro-action-editor/tab'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { MacroActionEditorComponent } from './macro-action-editor.component'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <div class="action--editor"> | ||
| <div class="row"> | ||
| <div class="col-xs-4 editor__tab-links"> | ||
| <ul class="nav nav-pills nav-stacked"> | ||
| <li #macroText [class.active]="activeTab === TabName.Text" (click)="selectTab(TabName.Text)"> | ||
| <a> | ||
| <i class="fa fa-font"></i> | ||
| <span>Type text</span> | ||
| </a> | ||
| </li> | ||
| <li #macroKeypress [class.active]="activeTab === TabName.Keypress" (click)="selectTab(TabName.Keypress)"> | ||
| <a> | ||
| <i class="fa fa-keyboard-o"></i> | ||
| <span>Key action</span> | ||
| </a> | ||
| </li> | ||
| <li #macroMouse [class.active]="activeTab === TabName.Mouse" (click)="selectTab(TabName.Mouse)"> | ||
| <a> | ||
| <i class="fa fa-mouse-pointer"></i> | ||
| <span>Mouse action</span> | ||
| </a> | ||
| </li> | ||
| <li #macroDelay [class.active]="activeTab === TabName.Delay" (click)="selectTab(TabName.Delay)"> | ||
| <a> | ||
| <i class="fa fa-clock-o"></i> | ||
| <span>Delay</span> | ||
| </a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="col-xs-8 editor__tabs" [ngSwitch]="activeTab"> | ||
| <macro-text-tab #tab *ngSwitchCase="TabName.Text" [macroAction]="editableMacroAction"></macro-text-tab> | ||
| <macro-key-tab #tab *ngSwitchCase="TabName.Keypress" [macroAction]="editableMacroAction"></macro-key-tab> | ||
| <macro-mouse-tab #tab *ngSwitchCase="TabName.Mouse" [macroAction]="editableMacroAction"></macro-mouse-tab> | ||
| <macro-delay-tab #tab *ngSwitchCase="TabName.Delay" [macroAction]="editableMacroAction"></macro-delay-tab> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-xs-12 flex-button-wrapper editor__actions-container"> | ||
| <div class="editor__actions"> | ||
| <button class="btn btn-sm btn-default flex-button" type="button" (click)="onCancelClick()"> Cancel </button> | ||
| <button class="btn btn-sm btn-primary flex-button" type="button" (click)="onSaveClick()"> Save </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| .action--editor { | ||
| padding-top: 0; | ||
| padding-bottom: 0; | ||
| border-radius: 0; | ||
| border: 0; | ||
| } | ||
|
|
||
| .nav { | ||
| padding-bottom: 1rem; | ||
|
|
||
| li { | ||
| a { | ||
| border-top-right-radius: 0; | ||
| border-bottom-right-radius: 0; | ||
|
|
||
| &.selected { | ||
| font-style: italic; | ||
| } | ||
|
|
||
| &:hover { | ||
| cursor: pointer; | ||
| } | ||
| } | ||
|
|
||
| &.active { | ||
| z-index: 2; | ||
|
|
||
| a { | ||
| &.selected { | ||
| font-style: normal; | ||
| } | ||
|
|
||
| &:after { | ||
| content: ''; | ||
| display: block; | ||
| position: absolute; | ||
| width: 0; | ||
| height: 0; | ||
| top: 0; | ||
| right: -4rem; | ||
| border-color: transparent transparent transparent #337ab7; | ||
| border-style: solid; | ||
| border-width: 2rem; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .editor { | ||
| &__tabs, | ||
| &__tab-links { | ||
| padding-top: 1rem; | ||
| } | ||
|
|
||
| &__tabs { | ||
| border-left: 1px solid #ddd; | ||
| margin-left: -1.6rem; | ||
| padding-left: 3rem; | ||
| } | ||
|
|
||
| &__actions { | ||
| float: right; | ||
|
|
||
| &-container { | ||
| background: #f5f5f5; | ||
| border-top: 1px solid #ddd; | ||
| padding: 1rem 1.5rem; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .flex-button-wrapper { | ||
| display: flex; | ||
| flex-direction: row-reverse; | ||
| } | ||
|
|
||
| .flex-button { | ||
| align-self: flex-end; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; | ||
|
|
||
| import { | ||
| EditableMacroAction, | ||
| MacroAction, | ||
| TextMacroAction, | ||
| macroActionType | ||
| } from '../../../config-serializer/config-items/macro-action'; | ||
| import { MacroKeyTabComponent } from './tab/macro-key'; | ||
|
|
||
| enum TabName { | ||
| Keypress, | ||
| Text, | ||
| Mouse, | ||
| Delay | ||
| }; | ||
|
|
||
| @Component({ | ||
| selector: 'macro-action-editor', | ||
| template: require('./macro-action-editor.component.html'), | ||
| styles: [require('./macro-action-editor.component.scss')], | ||
| host: { 'class': 'macro-action-editor' } | ||
| }) | ||
| export class MacroActionEditorComponent implements OnInit { | ||
| @Input() macroAction: MacroAction; | ||
|
|
||
| @Output() save = new EventEmitter<MacroAction>(); | ||
| @Output() cancel = new EventEmitter<void>(); | ||
|
|
||
| @ViewChild('tab') selectedTab: any; | ||
|
There was a problem hiding this comment. Use/create the proper type instead of There was a problem hiding this comment. any is fine here because each tab is quite unique, only some of them implement Tab and I didn't want to create a completely redundant class or interface for these as there are no shared properties or methods. |
||
|
|
||
| private editableMacroAction: EditableMacroAction; | ||
| private activeTab: TabName; | ||
| /* tslint:disable:variable-name: It is an enum type. So it can start with uppercase. */ | ||
| /* tslint:disable:no-unused-variable: It is used in the template. */ | ||
| private TabName = TabName; | ||
| /* tslint:enable:no-unused-variable */ | ||
| /* tslint:enable:variable-name */ | ||
|
|
||
| ngOnInit() { | ||
| let macroAction: MacroAction = this.macroAction ? this.macroAction : new TextMacroAction(); | ||
| this.editableMacroAction = new EditableMacroAction(macroAction.toJsObject()); | ||
| let tab: TabName = this.getTabName(this.editableMacroAction); | ||
| this.activeTab = tab; | ||
| } | ||
|
|
||
| onCancelClick(): void { | ||
| this.cancel.emit(); | ||
| } | ||
|
|
||
| onSaveClick(): void { | ||
| try { | ||
| const action = this.editableMacroAction; | ||
| if (action.isKeyAction()) { | ||
| // Could updating the saved keys be done in a better way? | ||
| const tab = this.selectedTab as MacroKeyTabComponent; | ||
|
There was a problem hiding this comment. The selected tab isn't always There was a problem hiding this comment. It should work fine because of the isKeyAction check as changing the tab means also changing EditableMacroAction.macroActionType. So it should not be possible to select a different tab and have isKeyAction pass. The real solution would be to update the EditableMacroAction every time something is changed in the key press component by providing an output event that gets run every time you change something in it. The reason I didn't do this is because I wanted to keep my changes in the macro components as much as possible and not mess with the other stuff. There was a problem hiding this comment. Okay, now I understand, it is fine. |
||
| action.fromKeyAction(tab.getKeyAction()); | ||
| } | ||
| this.save.emit(action.toClass()); | ||
| } catch (e) { | ||
| // TODO: show error dialog | ||
| console.error(e); | ||
| } | ||
| } | ||
|
|
||
| selectTab(tab: TabName): void { | ||
| this.activeTab = tab; | ||
| this.editableMacroAction.macroActionType = this.getTabMacroActionType(tab); | ||
| } | ||
|
|
||
| getTabName(action: EditableMacroAction): TabName { | ||
| switch (action.macroActionType) { | ||
| // Delay action | ||
| case macroActionType.DelayMacroAction: | ||
| return TabName.Delay; | ||
| // Text action | ||
| case macroActionType.TextMacroAction: | ||
| return TabName.Text; | ||
| // Keypress actions | ||
| case macroActionType.KeyMacroAction: | ||
| return TabName.Keypress; | ||
| // Mouse actions | ||
| case macroActionType.MouseButtonMacroAction: | ||
| case macroActionType.MoveMouseMacroAction: | ||
| case macroActionType.ScrollMouseMacroAction: | ||
| return TabName.Mouse; | ||
| default: | ||
| return TabName.Keypress; | ||
| } | ||
| } | ||
|
|
||
| getTabMacroActionType(tab: TabName): string { | ||
| switch (tab) { | ||
| case TabName.Delay: | ||
| return macroActionType.DelayMacroAction; | ||
| case TabName.Keypress: | ||
| return macroActionType.KeyMacroAction; | ||
| case TabName.Mouse: | ||
| return macroActionType.MouseButtonMacroAction; | ||
| case TabName.Text: | ||
| return macroActionType.TextMacroAction; | ||
| default: | ||
| throw new Error('Could not get macro action type'); | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| export { MacroDelayTabComponent } from './macro-delay'; | ||
| export { MacroKeyTabComponent } from './macro-key'; | ||
| export { MacroMouseTabComponent } from './macro-mouse'; | ||
| export { MacroTextTabComponent } from './macro-text'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { MacroDelayTabComponent } from './macro-delay.component'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <div class="macro-delay"> | ||
| <div class="row"> | ||
| <div class="col-xs-12"> | ||
| <h4>Enter delay in seconds</h4> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-xs-4"> | ||
| <input #macroDelayInput | ||
| type="number" | ||
| min="0" | ||
| max="1000" | ||
| step="0.1" | ||
| placeholder="Delay amount" | ||
| class="form-control" | ||
| [(ngModel)]="delay" | ||
| (ngModelChange)="setDelay($event)"> | ||
| </div> | ||
| </div> | ||
| <div class="row macro-delay__presets"> | ||
| <div class="col-xs-12"> | ||
| <h6>Choose a preset</h6> | ||
| <button *ngFor="let delay of presets" class="btn btn-sm btn-default"(click)="setDelay(delay)">{{delay}}s</button> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| :host { | ||
| display: flex; | ||
| flex-direction: column; | ||
| position: relative; | ||
| } | ||
|
|
||
| .macro-delay { | ||
| &__presets { | ||
| margin-top: 1rem; | ||
|
|
||
| button { | ||
| margin-right: 0.25rem; | ||
| margin-bottom: 0.25rem; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a new line before services.