Skip to content

Commit 52b33ae

Browse files
heng30heng30
committed
[*] improve ui
1 parent a861cc9 commit 52b33ae

29 files changed

+79
-88
lines changed

‎wayshot/ui/panel/desktop/video-editor/right-panel/filter/audio.slint‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,3 @@ export component FilterAudioDetail inherits Rectangle {
6464
selected-filter: selected-filter;
6565
}
6666
}
67-

‎wayshot/ui/panel/desktop/video-editor/right-panel/filter/audio/compressor.slint‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export component Compressor inherits Rectangle {
2525
SettingDetailInnerVbox {
2626
SettingDetailLabel {
2727
text: Logic.tr("Threshold (dB)");
28-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
28+
enabled: selected-filter.enabled;
2929
}
3030

3131
LineInput {
@@ -44,7 +44,7 @@ export component Compressor inherits Rectangle {
4444
SettingDetailInnerVbox {
4545
SettingDetailLabel {
4646
text: Logic.tr("Ratio");
47-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
47+
enabled: selected-filter.enabled;
4848
}
4949

5050
LineInput {
@@ -63,7 +63,7 @@ export component Compressor inherits Rectangle {
6363
SettingDetailInnerVbox {
6464
SettingDetailLabel {
6565
text: Logic.tr("Attack (ms)");
66-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
66+
enabled: selected-filter.enabled;
6767
}
6868

6969
LineInput {
@@ -82,7 +82,7 @@ export component Compressor inherits Rectangle {
8282
SettingDetailInnerVbox {
8383
SettingDetailLabel {
8484
text: Logic.tr("Release (ms)");
85-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
85+
enabled: selected-filter.enabled;
8686
}
8787

8888
LineInput {
@@ -100,8 +100,8 @@ export component Compressor inherits Rectangle {
100100

101101
SettingDetailInnerVbox {
102102
SettingDetailLabel {
103-
text: Logic.tr("Makeup Gain (dB)");
104-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
103+
text: Logic.tr("Makeup gain (dB)");
104+
enabled: selected-filter.enabled;
105105
}
106106

107107
LineInput {
@@ -118,4 +118,3 @@ export component Compressor inherits Rectangle {
118118
}
119119
}
120120
}
121-

‎wayshot/ui/panel/desktop/video-editor/right-panel/filter/audio/fade-in.slint‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export component FadeIn inherits Rectangle {
2525
SettingDetailInnerVbox {
2626
SettingDetailLabel {
2727
text: Logic.tr("Duration (ms)");
28-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
28+
enabled: selected-filter.enabled;
2929
}
3030

3131
LineInput {

‎wayshot/ui/panel/desktop/video-editor/right-panel/filter/audio/fade-out.slint‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export component FadeOut inherits Rectangle {
2525
SettingDetailInnerVbox {
2626
SettingDetailLabel {
2727
text: Logic.tr("Duration (ms)");
28-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
28+
enabled: selected-filter.enabled;
2929
}
3030

3131
LineInput {

‎wayshot/ui/panel/desktop/video-editor/right-panel/filter/audio/gain.slint‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export component Gain inherits Rectangle {
2525
SettingDetailInnerVbox {
2626
SettingDetailLabel {
2727
text: Logic.tr("Amplitude");
28-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
28+
enabled: selected-filter.enabled;
2929
}
3030

3131
LineInput {

‎wayshot/ui/panel/desktop/video-editor/right-panel/filter/audio/limiter.slint‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export component Limiter inherits Rectangle {
2525
SettingDetailInnerVbox {
2626
SettingDetailLabel {
2727
text: Logic.tr("Threshold (dB)");
28-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
28+
enabled: selected-filter.enabled;
2929
}
3030

3131
LineInput {

‎wayshot/ui/panel/desktop/video-editor/right-panel/filter/audio/noise-gate.slint‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export component NoiseGate inherits Rectangle {
2525
SettingDetailInnerVbox {
2626
SettingDetailLabel {
2727
text: Logic.tr("Threshold (dB)");
28-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
28+
enabled: selected-filter.enabled;
2929
}
3030

3131
LineInput {
@@ -44,7 +44,7 @@ export component NoiseGate inherits Rectangle {
4444
SettingDetailInnerVbox {
4545
SettingDetailLabel {
4646
text: Logic.tr("Ratio");
47-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
47+
enabled: selected-filter.enabled;
4848
}
4949

5050
LineInput {
@@ -63,7 +63,7 @@ export component NoiseGate inherits Rectangle {
6363
SettingDetailInnerVbox {
6464
SettingDetailLabel {
6565
text: Logic.tr("Attack (ms)");
66-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
66+
enabled: selected-filter.enabled;
6767
}
6868

6969
LineInput {
@@ -82,7 +82,7 @@ export component NoiseGate inherits Rectangle {
8282
SettingDetailInnerVbox {
8383
SettingDetailLabel {
8484
text: Logic.tr("Hold (ms)");
85-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
85+
enabled: selected-filter.enabled;
8686
}
8787

8888
LineInput {
@@ -101,7 +101,7 @@ export component NoiseGate inherits Rectangle {
101101
SettingDetailInnerVbox {
102102
SettingDetailLabel {
103103
text: Logic.tr("Release (ms)");
104-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
104+
enabled: selected-filter.enabled;
105105
}
106106

107107
LineInput {

‎wayshot/ui/panel/desktop/video-editor/right-panel/filter/audio/normalize.slint‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ export component Normalize inherits Rectangle {
2424
interactive: false;
2525
SettingDetailInnerVbox {
2626
SettingDetailLabel {
27-
text: Logic.tr("Target Level (dB)");
28-
color: selected-filter.enabled ? Theme.primary-text-color : Theme.disabled-color;
27+
text: Logic.tr("Target level (dB)");
28+
enabled: selected-filter.enabled;
2929
}
3030

3131
LineInput {
@@ -42,4 +42,3 @@ export component Normalize inherits Rectangle {
4242
}
4343
}
4444
}
45-

‎wayshot/ui/panel/desktop/video-editor/right-panel/filter/filter.slint‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -446,16 +446,13 @@ component SegmentFilter inherits Rectangle {
446446

447447
rec := Rectangle {
448448
y: td.y + td.height;
449-
450-
// todo
451-
// visible: sl.selected-index >= 0;
452-
visible: true;
449+
visible: sl.selected-index >= 0;
450+
// visible: true; // todo
453451
max-height: root.height - tab.height;
454452
height: root.height * 2 / 3;
455453
background: Theme.secondary-background;
456454

457-
// todo
458-
if tab.checked-index == 0 || true: FilterVideoDetail {
455+
if tab.checked-index == 0: FilterVideoDetail {
459456
y: 0;
460457
selected-filter: selected-filter;
461458
index: sl.selected-index;
@@ -467,7 +464,7 @@ component SegmentFilter inherits Rectangle {
467464
index: sl.selected-index;
468465
}
469466

470-
if tab.checked-index == 2: FilterOverlayDetail {
467+
if tab.checked-index == 2 || true: FilterOverlayDetail {
471468
y: 0;
472469
selected-filter: selected-filter;
473470
index: sl.selected-index;
@@ -480,13 +477,12 @@ component SegmentFilter inherits Rectangle {
480477
}
481478
}
482479

483-
// todo
484-
// if sl.selected-index < 0: NoDataImg {
485-
// y: td.y + td.height;
486-
// height: root.height * 2 / 3;
487-
// text: Logic.tr("No Detail");
488-
// font-size: Theme.default-font-size;
489-
// }
480+
if sl.selected-index < 0: NoDataImg {
481+
y: td.y + td.height;
482+
height: root.height * 2 / 3;
483+
text: Logic.tr("No Detail");
484+
font-size: Theme.default-font-size;
485+
}
490486
}
491487

492488
component FilterSelector inherits VerticalLayout {
@@ -621,10 +617,8 @@ component FilterSelector inherits VerticalLayout {
621617
export component Filter inherits Rectangle {
622618
private property <bool> is-show-selector;
623619
private property <FilterType> filter-tab-type;
624-
625-
// todo
626-
private property <bool> is-show-segment-filter: true;
627-
// private property <bool> is-show-segment-filter: Store.video-editor-current-edited-track-index >= 0 && Store.video-editor-selected-segments-index.length > 0;
620+
// private property <bool> is-show-segment-filter: true; // todo
621+
private property <bool> is-show-segment-filter: Store.video-editor-current-edited-track-index >= 0 && Store.video-editor-selected-segments-index.length > 0;
628622

629623
if !is-show-segment-filter: NoDataImg {
630624
text: Logic.tr("No Filter");

‎wayshot/ui/panel/desktop/video-editor/right-panel/filter/overlay.slint‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ export component FilterOverlayDetail inherits Rectangle {
8484
}
8585
}
8686

87-
// TODO: 使用颜色选择器
8887
if selected-filter.name.to-lowercase() == "chroma-key": ChromaKey {
8988
index: index;
9089
width: parent.width;
@@ -105,7 +104,6 @@ export component FilterOverlayDetail inherits Rectangle {
105104
}
106105
}
107106

108-
// TODO:
109107
if selected-filter.name.to-lowercase() == "zoom": Zoom {
110108
index: index;
111109
width: parent.width;
@@ -116,7 +114,6 @@ export component FilterOverlayDetail inherits Rectangle {
116114
}
117115
}
118116

119-
// TODO:
120117
if selected-filter.name.to-lowercase() == "crop": Crop {
121118
index: index;
122119
width: parent.width;

0 commit comments

Comments
 (0)
⚡