From a094f2286b0675d2f3932e942fffaa088d406b38 Mon Sep 17 00:00:00 2001 From: Nicklas Ronge Date: Tue, 28 Jul 2020 17:26:40 +0200 Subject: [PATCH] - added experimental horizontal layout (enableable at the settings) for the evaluate dialog (#769) --- CHANGELOG.md | 1 + overlay.babel | 53 +++ .../evaluate-item-frame.component.html | 38 ++- .../evaluate-item-frame.component.scss | 24 ++ .../evaluate-item-frame.component.ts | 1 + .../evaluate-settings.component.html | 305 +++++++++--------- .../evaluate/evaluate-feature-settings.ts | 1 + src/app/modules/evaluate/evaluate.module.ts | 1 + .../item-frame/item-frame.component.html | 97 +++--- .../item-frame/item-frame.component.scss | 10 +- src/assets/i18n/english.json | 1 + src/assets/i18n/french.json | 1 + src/assets/i18n/german.json | 1 + src/assets/i18n/korean.json | 1 + src/assets/i18n/polish.json | 1 + src/assets/i18n/portuguese.json | 1 + src/assets/i18n/russian.json | 1 + src/assets/i18n/simplified-chinese.json | 1 + src/assets/i18n/spanish.json | 1 + src/assets/i18n/thai.json | 1 + src/assets/i18n/traditional-chinese.json | 1 + 21 files changed, 325 insertions(+), 217 deletions(-) create mode 100644 src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index a9c2008d..3c73e4dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - added latest_whisper placeholder for commands - added item images at the search market - added different step sizes at the exchange market (CTRL 50, SHIFT 25, ALT 5) (#797) +- added experimental horizontal layout (enableable at the settings) for the evaluate dialog (#769) - updated windows to be draggable by their content (#768) - fixed an issue at the market enabling sockets to be toggleable diff --git a/overlay.babel b/overlay.babel index b1b72704..c317e3be 100644 --- a/overlay.babel +++ b/overlay.babel @@ -6684,6 +6684,59 @@ layout + + horizontal + false + + + + + + de-DE + false + + + en-US + false + + + es-ES + false + + + fr-FR + false + + + ko-KR + false + + + pl-PL + false + + + pt-BR + false + + + ru-RU + false + + + th-TH + false + + + zh-CHS + false + + + zh-CHT + false + + + name false diff --git a/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.html b/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.html index 9bf7f183..6c5c7deb 100644 --- a/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.html +++ b/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.html @@ -1,17 +1,21 @@ - - - - - - - - - \ No newline at end of file +
+ + + + + + + + + +
\ No newline at end of file diff --git a/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.scss b/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.scss new file mode 100644 index 00000000..7f3722fb --- /dev/null +++ b/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.scss @@ -0,0 +1,24 @@ +$border-color: #1a1a1a; + +::ng-deep { + app-evaluate-item-frame { + .horizontal { + app-item-frame { + .detail { + display: flex; + } + + .inner { + display: flex; + flex-direction: column; + justify-content: center; + border-right: 1px solid $border-color; + } + } + + .settings { + right: calc(50% + 3px) !important; + } + } + } +} diff --git a/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.ts b/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.ts index 459bca1e..db9c706a 100644 --- a/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.ts +++ b/src/app/modules/evaluate/component/evaluate-item-frame/evaluate-item-frame.component.ts @@ -10,6 +10,7 @@ import { EvaluateItemOptions } from '../evaluate-item-options/evaluate-item-opti @Component({ selector: 'app-evaluate-item-frame', templateUrl: './evaluate-item-frame.component.html', + styleUrls: ['./evaluate-item-frame.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) export class EvaluateItemFrameComponent implements OnInit, OnDestroy { diff --git a/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.html b/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.html index 36731e06..44d93c48 100644 --- a/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.html +++ b/src/app/modules/evaluate/component/evaluate-settings/evaluate-settings.component.html @@ -56,6 +56,10 @@
+ + {{'evaluate.layout.horizontal' | translate}} + {{'evaluate.layout.value' | translate}} @@ -116,170 +120,165 @@
--> - - {{'evaluate.item-search.filter.name' | translate}} -
- - {{'evaluate.item-search.filter.online-only' | translate}} - -
- - {{'evaluate.item-search.filter.max-age.name' | translate}} - - {{'evaluate.item-search.filter.max-age.any' | translate}} - - {{'evaluate.item-search.filter.max-age.day' | translate}} - - {{'evaluate.item-search.filter.max-age.days' | translate}} - - {{'evaluate.item-search.filter.max-age.week' | translate}} - - {{'evaluate.item-search.filter.max-age.weeks' | translate}} - - {{'evaluate.item-search.filter.max-age.month' | translate}} - - {{'evaluate.item-search.filter.max-age.months' | translate}} - - - -
+ + {{'evaluate.item-search.filter.name' | translate}} +
+ + {{'evaluate.item-search.filter.online-only' | translate}} + +
+ + {{'evaluate.item-search.filter.max-age.name' | translate}} + + {{'evaluate.item-search.filter.max-age.any' | translate}} + + {{'evaluate.item-search.filter.max-age.day' | translate}} + + {{'evaluate.item-search.filter.max-age.days' | translate}} + + {{'evaluate.item-search.filter.max-age.week' | translate}} + + {{'evaluate.item-search.filter.max-age.weeks' | translate}} + + {{'evaluate.item-search.filter.max-age.month' | translate}} + + {{'evaluate.item-search.filter.max-age.months' | translate}} + + + +
- - {{'evaluate.item-search.property.name' | translate}} + + {{'evaluate.item-search.property.name' | translate}} - -
- # - - -
- {{50 * ( 1 - (settings.evaluateItemSearchPropertyMinRange / 100)) | number : '1.0-1'}} - ~ - {{50 * ( 1 + (settings.evaluateItemSearchPropertyMaxRange / 100)) | number : '1.0-1'}} - # -
- - - # - -
- 50 -
-
-
+ +
+ # + + +
+ {{50 * ( 1 - (settings.evaluateItemSearchPropertyMinRange / 100)) | number : '1.0-1'}} + ~ + {{50 * ( 1 + (settings.evaluateItemSearchPropertyMaxRange / 100)) | number : '1.0-1'}} + # +
+ + + # + +
+ 50 +
+
+
-
- - {{'evaluate.item-search.property.attack' | translate}} - - - {{'evaluate.item-search.property.defense' | translate}} - - - {{'evaluate.item-search.property.normalize-quality' | translate}} - -
-
- - {{'evaluate.item-search.property.item-level' | translate}} - - - {{'evaluate.item-search.property.item-type' | translate}} - - - {{'evaluate.item-search.property.miscs' | translate}} - -
+
+ + {{'evaluate.item-search.property.attack' | translate}} + + + {{'evaluate.item-search.property.defense' | translate}} + + + {{'evaluate.item-search.property.normalize-quality' | translate}} + +
+
+ + {{'evaluate.item-search.property.item-level' | translate}} + + + {{'evaluate.item-search.property.item-type' | translate}} + + + {{'evaluate.item-search.property.miscs' | translate}} + +
-
- - {{'evaluate.item-search.property.link' | translate}} - - - {{'evaluate.item-search.property.links.always' | translate}} - - 5-6 - 6 - - {{'evaluate.item-search.property.links.never' | translate}} - - - -
-
+
+ + {{'evaluate.item-search.property.link' | translate}} + + + {{'evaluate.item-search.property.links.always' | translate}} + + 5-6 + 6 + + {{'evaluate.item-search.property.links.never' | translate}} + + + +
+
- - {{'evaluate.item-search.stat.name' | translate}} + + {{'evaluate.item-search.stat.name' | translate}} - -
- # - - -
- {{50 * ( 1 - (settings.evaluateItemSearchStatMinRange / 100)) | number : '1.0-1'}} - ~ - {{50 * ( 1 + (settings.evaluateItemSearchStatMaxRange / 100)) | number : '1.0-1'}} - # -
- - - # - -
- 50 -
-
-
+ +
+ # + + +
+ {{50 * ( 1 - (settings.evaluateItemSearchStatMinRange / 100)) | number : '1.0-1'}} + ~ + {{50 * ( 1 + (settings.evaluateItemSearchStatMaxRange / 100)) | number : '1.0-1'}} + # +
+ + + # + +
+ 50 +
+
+
-
- - {{'evaluate.item-search.stat.unique-all' | translate}} - -
+
+ + {{'evaluate.item-search.stat.unique-all' | translate}} + +
+ + + + + {{item.type}} + {{item.text}} + + + - - - - {{item.type}} - {{item.text}} - - - - - -
- - - - - - - - +
+ + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - - - - + + + + + + + +
+
+ +
\ No newline at end of file diff --git a/src/app/shared/module/poe/item/frame/item-frame/item-frame.component.scss b/src/app/shared/module/poe/item/frame/item-frame/item-frame.component.scss index d270febb..595da3bb 100644 --- a/src/app/shared/module/poe/item/frame/item-frame/item-frame.component.scss +++ b/src/app/shared/module/poe/item/frame/item-frame/item-frame.component.scss @@ -9,8 +9,16 @@ .detail { position: relative; + white-space: pre; + } + + .inner { + position: relative; + } + + .inner, + .outer { padding: 2px; min-width: 396px; - white-space: pre; } } diff --git a/src/assets/i18n/english.json b/src/assets/i18n/english.json index 946732df..f9edef00 100644 --- a/src/assets/i18n/english.json +++ b/src/assets/i18n/english.json @@ -222,6 +222,7 @@ } }, "layout": { + "horizontal": "Display horizontal", "name": "Layout", "value": "Result View", "values": { diff --git a/src/assets/i18n/french.json b/src/assets/i18n/french.json index 58be2d4b..32dfd50b 100644 --- a/src/assets/i18n/french.json +++ b/src/assets/i18n/french.json @@ -218,6 +218,7 @@ } }, "layout": { + "horizontal": "Affichage horizontal", "name": "Disposition", "value": "Affichage des résultats", "values": { diff --git a/src/assets/i18n/german.json b/src/assets/i18n/german.json index f42ae1ce..70dc7dca 100644 --- a/src/assets/i18n/german.json +++ b/src/assets/i18n/german.json @@ -218,6 +218,7 @@ } }, "layout": { + "horizontal": "Horizontal anzeigen", "name": "Layout", "value": "Ergebnisansicht", "values": { diff --git a/src/assets/i18n/korean.json b/src/assets/i18n/korean.json index 6255a653..9b22f3ea 100644 --- a/src/assets/i18n/korean.json +++ b/src/assets/i18n/korean.json @@ -218,6 +218,7 @@ } }, "layout": { + "horizontal": "가로로 표시", "name": "형세", "value": "결과보기", "values": { diff --git a/src/assets/i18n/polish.json b/src/assets/i18n/polish.json index 3503a5ce..0f66d303 100644 --- a/src/assets/i18n/polish.json +++ b/src/assets/i18n/polish.json @@ -218,6 +218,7 @@ } }, "layout": { + "horizontal": "Wyświetl w poziomie", "name": "Układ", "value": "Okno wyników", "values": { diff --git a/src/assets/i18n/portuguese.json b/src/assets/i18n/portuguese.json index 79c9e15b..57a93cf7 100644 --- a/src/assets/i18n/portuguese.json +++ b/src/assets/i18n/portuguese.json @@ -218,6 +218,7 @@ } }, "layout": { + "horizontal": "Exibir horizontal", "name": "Layout", "value": "Visualização de resultados", "values": { diff --git a/src/assets/i18n/russian.json b/src/assets/i18n/russian.json index 45dc9e16..7c1be2d0 100644 --- a/src/assets/i18n/russian.json +++ b/src/assets/i18n/russian.json @@ -218,6 +218,7 @@ } }, "layout": { + "horizontal": "Горизонтальный дисплей", "name": "раскладка", "value": "Просмотр результатов", "values": { diff --git a/src/assets/i18n/simplified-chinese.json b/src/assets/i18n/simplified-chinese.json index 6624ef97..6a553cd6 100644 --- a/src/assets/i18n/simplified-chinese.json +++ b/src/assets/i18n/simplified-chinese.json @@ -218,6 +218,7 @@ } }, "layout": { + "horizontal": "显示水平", "name": "布局", "value": "结果视图", "values": { diff --git a/src/assets/i18n/spanish.json b/src/assets/i18n/spanish.json index f7f9a56d..f4f99628 100644 --- a/src/assets/i18n/spanish.json +++ b/src/assets/i18n/spanish.json @@ -218,6 +218,7 @@ } }, "layout": { + "horizontal": "Pantalla horizontal", "name": "diseño", "value": "Vista de resultados", "values": { diff --git a/src/assets/i18n/thai.json b/src/assets/i18n/thai.json index ef8bfeab..b9311d83 100644 --- a/src/assets/i18n/thai.json +++ b/src/assets/i18n/thai.json @@ -218,6 +218,7 @@ } }, "layout": { + "horizontal": "แสดงแนวนอน", "name": "แบบ", "value": "ดูผลลัพธ์", "values": { diff --git a/src/assets/i18n/traditional-chinese.json b/src/assets/i18n/traditional-chinese.json index 0f2692b8..b9984ccc 100644 --- a/src/assets/i18n/traditional-chinese.json +++ b/src/assets/i18n/traditional-chinese.json @@ -218,6 +218,7 @@ } }, "layout": { + "horizontal": "顯示水平", "name": "版面", "value": "結果呈現", "values": {