Skip to content

fix uehaj2022 / latteart#56 #59

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
Sreelakshmi-Aneesh wants to merge 7 commits into
base: main
Choose a base branch
from
Open

fix uehaj2022 / latteart#56 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99b17bc
fix uehaj2022 / latteart#44
Sreelakshmi-Aneesh Jan 10, 2023
46e7834
Merge pull request #1 from Sreelakshmi-Aneesh/Sreelakshmi-Aneesh-patch-2
Sreelakshmi-Aneesh Jan 10, 2023
366e642
Update OperationList.vue
Sreelakshmi-Aneesh Jan 10, 2023
ea423eb
Update CaptureToolHeader.vue
Sreelakshmi-Aneesh Feb 1, 2023
e98dca6
Merge pull request #2 from Sreelakshmi-Aneesh/Sreelakshmi-Aneesh-patch-5
Sreelakshmi-Aneesh Feb 1, 2023
2db1afc
Revert "fix uehaj2022 / latteart#56"
Sreelakshmi-Aneesh Feb 1, 2023
c399456
fix uehaj2022 / latteart#56
Sreelakshmi-Aneesh Feb 1, 2023
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
95 changes: 70 additions & 25 deletions ...ponents/pages/captureControl/expCapture/organisms/captureToolHeader/CaptureToolHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,25 @@
-->

<template>
<v-layout
justify-space-between
align-space-between
row
@keydown="cancelKeydown"
>
<div>
<v-layout>
<url-text-field />
<test-result-name-text-field />
<v-btn
color="primary"
@click="submitForm"
>
Submit
</v-btn>
</v-layout>
</div>
</v-layout>
<v-layout justify-start align-center row @keydown="cancelKeydown">
<url-text-field />
<test-result-name-text-field />
Expand All @@ -24,10 +43,57 @@
<record-button />
<pause-button />
<clear-history-button />

<load-history-button />
<menu-button />
</v-layout>
</div>
<div>
<v-layout>
<load-history-button />
<menu-button />
<v-spacer />
<v-icon @click="openSettings">settings</v-icon>
</v-layout>
</div>
<v-menu
top
offset-y
origin="center center"
transition="scale-transition"
:close-on-content-click="false"
>
<template v-slot:activator="{ on, attrs }">
<v-btn icon flat large v-bind="attrs" v-on="on">
<v-icon>menu</v-icon>
</v-btn>
</template>


<v-list>
<v-list-item>
<v-list-item-title>
<v-flex shrink pa-1 pl-3>
<locale-select-box />
</v-flex>
</v-list-item-title>
</v-list-item>
<v-list-item>
<v-list-item-title>
<v-flex shrink pa-1 pl-3>
<remote-access-field color="inherit" />
</v-flex>
</v-list-item-title>
</v-list-item>
<v-list-item>
<v-list-item-title>
<v-flex shrink pa-1 pl-3>
<v-switch label="Dark Mode" v-model="darkMode" />
</v-flex>
</v-list-item-title>
</v-list-item>
</v-list>
</v-menu>

<v-flex shrink pa-1 pl-3>
<locale-select-box />
Expand All @@ -38,34 +104,13 @@
</template>

<script lang="ts">
import RemoteAccessField from "@/components/pages/common/organisms/RemoteAccessField.vue";
import { Component, Vue } from "vue-property-decorator";
import ClearHistoryButton from "./ClearHistoryButton.vue";
import GenerateTestScriptButton from "./GenerateTestScriptButton.vue";
import LoadHistoryButton from "./LoadHistoryButton.vue";
import LocaleSelectBox from "./LocaleSelectBox.vue";
import PauseButton from "./PauseButton.vue";
import RecordButton from "./RecordButton.vue";
import TestResultNameTextField from "./TestResultNameTextField.vue";
import URLTextField from "./URLTextField.vue";
import MenuButton from "./MenuButton.vue";

@Component({
components: {
"url-text-field": URLTextField,
"test-result-name-text-field": TestResultNameTextField,
"record-button": RecordButton,
"pause-button": PauseButton,
"clear-history-button": ClearHistoryButton,
"load-history-button": LoadHistoryButton,
"generate-test-script-button": GenerateTestScriptButton,

"locale-select-box": LocaleSelectBox,
"remote-access-field": RemoteAccessField,
"menu-button": MenuButton,
@@ -122,9 +66,6 @@ import MenuButton from "./MenuButton.vue";
},
})
export default class CaptureToolHeader extends Vue {
submitForm: any;
openSettings: any;
darkMode: any;
private cancelKeydown(event: Event) {
event.stopPropagation();
}
Expand Down
6 changes: 1 addition & 5 deletions src/gui/components/pages/operationHistory/organisms/OperationList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,7 @@
:label="message('operation.notice')"
v-model="noticeCheckbox"
></v-checkbox>
<v-text-field
class="search-item"
v-model="search"
:label="message('operation.query')"
></v-text-field>

</v-layout>

<operation-context-menu
Expand Down