Skip to content

fix uehaj2022 / latteart#21 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kushagra20251 wants to merge 10 commits into
base: issue/#21_confirmation_dialog
Choose a base branch
from
Open

fix uehaj2022 / latteart#21 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1f6aaf1
changes in legend view of management tool
kushagra20251 Nov 21, 2022
36c59fe
multi language legend
kushagra20251 Nov 28, 2022
9086d1c
added dialog box for confirmation of pause and resume
kushagra20251 Nov 28, 2022
621eca1
revert changes of previos commit
kushagra20251 Dec 2, 2022
545d0e7
Update PauseButton.vue
kushagra20251 Dec 2, 2022
cc42bc2
Update message_ja.json
kushagra20251 Dec 2, 2022
f8830b9
Update message_en.json
kushagra20251 Dec 2, 2022
37af994
Update LegendViewer.vue
kushagra20251 Dec 2, 2022
b7414f3
Update message_en.json
kushagra20251 Dec 2, 2022
90b0b8b
Update message_ja.json
kushagra20251 Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/gui/locale/message_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,13 @@
"status-pending": "Pending",
"text-pending": "Pending for bug fixes, etc."
},

"confirmation_dialog_box": {
"card-title": "Confirm" ,
"card-content":"Are you sure?",
"card-button-1":"Cancel",
"card-button-2":"Confirm"
},
"test-matrix-dialog": {
"test-matrix-name": "Test Matrix Name",
"setting-viewPoint": "View Point Settings",
Expand Down
6 changes: 6 additions & 0 deletions src/gui/locale/message_ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@
"status-pending": "修正待ち",
"text-pending": "バグの改修などの対応待ち"
},
"confirmation_dialog_box": {
"card-title": "確認",
"card-content": "本気ですか？",
"card-button-1": "キャンセル",
"card-button-2": "確認"
},
"test-matrix-dialog": {
"test-matrix-name": "テストマトリクス名",
"setting-viewPoint": "テスト観点の設定",
Expand Down
27 changes: 24 additions & 3 deletions src/gui/vue/pages/captureControl/expCapture/organisms/captureToolHeader/PauseButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
-->

<template>
<div>
<div>
<v-layout>
<v-btn
:disabled="!isCapturing"
@click="pushPauseButton"
@click="ConfirmationModelVisisbility=true"
icon
flat
large
Expand All @@ -27,7 +28,21 @@
>
<v-icon>pause</v-icon>
</v-btn>
</div>
</v-layout>
<v-layout row justify-centre>
<v-dialog v-model="ConfirmationModelVisisbility" presistent max-width="290">
<v-card>
<v-card-title class="error headline" style="font-weight:bold;">{{ $store.getters.message("confirmation_dialog_box.card-title") }}</v-card-title>
<v-card-text>{{ $store.getters.message("confirmation_dialog_box.card-content") }}</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn flat @click="ConfirmationModelVisisbility=false">{{ $store.getters.message("confirmation_dialog_box.card-button-1") }}</v-btn>
<v-btn color="error" flat @click="pushPauseButton" v-on:click="ConfirmationModelVisisbility=false">{{ $store.getters.message("confirmation_dialog_box.card-button-2") }}</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</v-layout>
</div>
</template>

<script lang="ts">
Expand Down Expand Up @@ -62,6 +77,12 @@ export default class PauseButton extends Vue {
} else {
this.$store.dispatch("captureControl/pauseCapturing");
}

}
data(){
return{
ConfirmationModelVisisbility:false,
};
}
}
</script>