MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-23 08:43:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: dialogs (#1224)

Browse Source 
* refactor: dialogs

* fix: storeAvatarImage

* FriendLog.vue

* FriendLog.vue

* FriendLog.vue

* GameLog.vue

* fix: next day button jumping to the wrong date

* sync master

* fix: launchGame

* Notification.vue

* Feed.vue

* Search.vue

* Profile.vue

* PlayerList.vue

* Login.vue

* utils

* update dialog

* del gameLog.pug

* fix

* fix: group role cannot be displayed currently

* fix: "Hide Friends in Same Instance" hides players in unrelated private instances (#1210)

* fix

* fix: "Hide Friends in Same Instance" does not work when "Split Favorite Friends" is enabled

* fix Notification.vue message

* fix: deleteFavoriteNoConfirm

* fix: feed status style

* fix: infinite loading when deleting note

* fix: private players will not be hidden when 'Hide Friends in Same Instance', and 'Hide Friends in Same Instance' will not work when 'Split Favorite Friends'
This commit is contained in:
pa
2025-05-14 19:01:15 +09:00
committed by GitHub
parent 5ca028b30a
commit e792ed481b
130 changed files with 14208 additions and 10462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/Settings/dialogs/AvatarProviderDialog.vue
View File

@@ -1,13 +1,10 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:visible="isAvatarProviderDialogVisible"
:title="t('dialog.avatar_database_provider.header')"
width="600px"
:before-close="beforeDialogClose"
@close="closeDialog"
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp">
@close="closeDialog">
<div>
<el-input
v-for="(provider, index) in avatarRemoteDatabaseProviderList"
@@ -24,18 +21,13 @@
{{ t('dialog.avatar_database_provider.add_provider') }}
</el-button>
</div>
</el-dialog>
</safe-dialog>
</template>
<script setup>
import { inject } from 'vue';
import { useI18n } from 'vue-i18n-bridge';
const { t } = useI18n();
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
defineProps({
avatarRemoteDatabaseProviderList: {
type: Array,

10
src/views/Settings/dialogs/ChangelogDialog.vue
View File

@@ -1,13 +1,10 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:before-close="beforeDialogClose"
:visible="changeLogDialog.visible"
:title="t('dialog.change_log.header')"
width="800px"
top="5vh"
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp"
@close="closeDialog">
<div v-if="changeLogDialog.visible" class="changelog-dialog">
<h2 v-text="changeLogDialog.buildName"></h2>
@@ -32,7 +29,7 @@
{{ t('dialog.change_log.close') }}
</el-button>
</template>
</el-dialog>
</safe-dialog>
</template>
<script setup>
@@ -41,9 +38,6 @@
const { t } = useI18n();
const openExternalLink = inject('openExternalLink');
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
const props = defineProps({
changeLogDialog: {

15
src/views/Settings/dialogs/FeedFiltersDialog.vue
View File

@@ -1,13 +1,10 @@
<template>
<el-dialog
:before-close="beforeDialogClose"
<safe-dialog
:visible="!!feedFiltersDialogMode"
:title="dialogTitle"
width="550px"
top="5vh"
destroy-on-close
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp"
@close="handleDialogClose">
<div class="toggle-list" style="height: 75vh; overflow-y: auto">
<div v-for="setting in currentOptions" :key="setting.key" class="toggle-item">
@@ -58,18 +55,14 @@
t('dialog.shared_feed_filters.close')
}}</el-button>
</template>
</el-dialog>
</safe-dialog>
</template>
<script setup>
import { computed, inject } from 'vue';
import { computed } from 'vue';
import { useI18n } from 'vue-i18n-bridge';
import configRepository from '../../../service/config';
import { feedFiltersOptions } from '../../../composables/settings/constants/feedFiltersOptions';
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
import { feedFiltersOptions } from '../../../composables/setting/constants/feedFiltersOptions';
const { t } = useI18n();

10
src/views/Settings/dialogs/LaunchOptionsDialog.vue
View File

@@ -1,12 +1,9 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:before-close="beforeDialogClose"
:visible="isLaunchOptionsDialogVisible"
:title="t('dialog.launch_options.header')"
width="600px"
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp"
@close="closeDialog">
<div style="font-size: 12px">
{{ t('dialog.launch_options.description') }} <br />
@@ -53,7 +50,7 @@
</el-button>
</div>
</template>
</el-dialog>
</safe-dialog>
</template>
<script setup>
@@ -61,9 +58,6 @@
import { useI18n } from 'vue-i18n-bridge';
import configRepository from '../../../service/config';
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
const openExternalLink = inject('openExternalLink');
const { t } = useI18n();

12
src/views/Settings/dialogs/NoteExportDialog.vue
View File

@@ -1,13 +1,10 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:before-close="beforeDialogClose"
:visible="isNoteExportDialogVisible"
:title="t('dialog.note_export.header')"
width="1000px"
@close="closeDialog"
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp">
@close="closeDialog">
<div style="font-size: 12px">
{{ t('dialog.note_export.description1') }} <br />
{{ t('dialog.note_export.description2') }} <br />
@@ -87,7 +84,7 @@
</template>
</el-table-column>
</data-tables>
</el-dialog>
</safe-dialog>
</template>
<script setup>
@@ -99,9 +96,6 @@
const { t } = useI18n();
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
const userImage = inject('userImage');
const userImageFull = inject('userImageFull');
const showUserDialog = inject('showUserDialog');

14
src/views/Settings/dialogs/NotificationPositionDialog.vue
View File

@@ -1,13 +1,10 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:visible="isNotificationPositionDialogVisible"
:title="t('dialog.notification_position.header')"
width="400px"
:before-close="beforeDialogClose"
@close="closeDialog"
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp">
@close="closeDialog">
<div style="font-size: 12px">
{{ t('dialog.notification_position.description') }}
</div>
@@ -45,18 +42,13 @@
</el-button>
</div>
</template>
</el-dialog>
</safe-dialog>
</template>
<script setup>
import { inject } from 'vue';
import { useI18n } from 'vue-i18n-bridge';
const { t } = useI18n();
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
defineProps({
isNotificationPositionDialogVisible: {
type: Boolean,

16
src/views/Settings/dialogs/OpenSourceSoftwareNoticeDialog.vue
View File

@@ -1,13 +1,10 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:before-close="beforeDialogClose"
:visible="ossDialog"
:title="t('dialog.open_source.header')"
width="650px"
@close="closeDialog"
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp">
@close="closeDialog">
<div v-once style="height: 350px; overflow: hidden scroll; word-break: break-all">
<div>
<span>{{ t('dialog.open_source.description') }}</span>
@@ -18,17 +15,12 @@
<pre style="font-size: 12px; white-space: pre-line">{{ lib.licenseText }}</pre>
</div>
</div>
</el-dialog>
</safe-dialog>
</template>
<script setup>
import { inject } from 'vue';
import { useI18n } from 'vue-i18n-bridge';
import { openSourceSoftwareLicenses } from '../../../composables/settings/constants/openSourceSoftwareLicenses';
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
import { openSourceSoftwareLicenses } from '../../../composables/setting/constants/openSourceSoftwareLicenses';
const { t } = useI18n();

4
src/views/Settings/dialogs/PrimaryPasswordDialog.vue
View File

@@ -1,5 +1,5 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:visible.sync="enablePrimaryPasswordDialog.visible"
:before-close="enablePrimaryPasswordDialog.beforeClose"
@@ -36,7 +36,7 @@
{{ t('dialog.primary_password.ok') }}
</el-button>
</template>
</el-dialog>
</safe-dialog>
</template>
<script setup>

21
src/views/Settings/dialogs/RegistryBackupDialog.vue
View File

@@ -1,14 +1,11 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:before-close="beforeDialogClose"
:visible="isRegistryBackupDialogVisible"
:title="t('dialog.registry_backup.header')"
width="600px"
@close="closeDialog"
@closed="clearVrcRegistryDialog"
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp">
@closed="clearVrcRegistryDialog">
<div style="margin-top: 10px">
<div style="display: flex; align-items: center; justify-content: space-between; font-size: 12px">
<span class="name" style="margin-right: 24px">{{ t('dialog.registry_backup.auto_backup') }}</span>
@@ -70,19 +67,17 @@
</div>
</div>
</div>
</el-dialog>
</safe-dialog>
</template>
<script setup>
import { getCurrentInstance, inject, ref, watch } from 'vue';
import { getCurrentInstance, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n-bridge';
import configRepository from '../../../service/config';
import utils from '../../../classes/utils';
const { t } = useI18n();
import { downloadAndSaveJson } from '../../../composables/shared/utils';
import configRepository from '../../../service/config';
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
const { t } = useI18n();
const instance = getCurrentInstance();
const { $confirm, $message, $prompt } = instance.proxy;
@@ -172,7 +167,7 @@
}
function saveVrcRegistryBackupToFile(row) {
utils.downloadAndSaveJson(row.name, row.data);
downloadAndSaveJson(row.name, row.data);
}
async function deleteVrcRegistryBackup(row) {

17
src/views/Settings/dialogs/ScreenshotMetadataDialog.vue
View File

@@ -1,13 +1,10 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:before-close="beforeDialogClose"
:visible.sync="screenshotMetadataDialog.visible"
:title="t('dialog.screenshot_metadata.header')"
width="1050px"
top="10vh"
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp">
top="10vh">
<div
v-if="screenshotMetadataDialog.visible"
v-loading="screenshotMetadataDialog.loading"
@@ -161,19 +158,16 @@
<br />
</span>
</div>
</el-dialog>
</safe-dialog>
</template>
<script setup>
import { ref, inject, computed, getCurrentInstance, watch } from 'vue';
import { ref, inject, getCurrentInstance, watch } from 'vue';
import { useI18n } from 'vue-i18n-bridge';
import { vrcPlusImageRequest } from '../../../api';
import Location from '../../../components/Location.vue';
const API = inject('API');
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
const showFullscreenImageDialog = inject('showFullscreenImageDialog');
const { t } = useI18n();
@@ -302,6 +296,9 @@
vrcPlusImageRequest
.uploadGalleryImage(base64Body)
.then((args) => {
// about uploadGalleryImage -> emit 'GALLERYIMAGE:ADD'
// no need to add to the gallery logic here
// because it refreshes when you open the gallery
$message({
message: t('message.gallery.uploaded'),
type: 'success'

23
src/views/Settings/dialogs/VRChatConfigDialog.vue
View File

@@ -1,14 +1,11 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:before-close="beforeDialogClose"
:visible="isVRChatConfigDialogVisible"
:title="t('dialog.config_json.header')"
width="420px"
top="10vh"
@close="closeDialog"
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp">
@close="closeDialog">
<div v-loading="loading">
<div style="font-size: 12px; word-break: keep-all">
{{ t('dialog.config_json.description1') }} <br />
@@ -185,26 +182,24 @@
</div>
</div>
</template>
</el-dialog>
</safe-dialog>
</template>
<script setup>
import { ref, watch, inject, getCurrentInstance, computed } from 'vue';
import { computed, getCurrentInstance, inject, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n-bridge';
import {
getVRChatResolution,
VRChatScreenshotResolutions,
VRChatCameraResolutions
} from '../../../composables/settings/constants/vrchatResolutions';
VRChatCameraResolutions,
VRChatScreenshotResolutions
} from '../../../composables/setting/constants/vrchatResolutions';
import { getVRChatResolution } from '../../../composables/setting/utils';
const { t } = useI18n();
const instance = getCurrentInstance();
const $confirm = instance.proxy.$confirm;
const $message = instance.proxy.$message;
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
const openExternalLink = inject('openExternalLink');
const props = defineProps({

12
src/views/Settings/dialogs/YouTubeApiDialog.vue
View File

@@ -1,13 +1,10 @@
<template>
<el-dialog
<safe-dialog
class="x-dialog"
:before-close="beforeDialogClose"
:visible="isYouTubeApiDialogVisible"
:title="t('dialog.youtube_api.header')"
width="400px"
@close="closeDialog"
@mousedown.native="dialogMouseDown"
@mouseup.native="dialogMouseUp">
@close="closeDialog">
<div style="font-size: 12px">{{ t('dialog.youtube_api.description') }} <br /></div>
<el-input
@@ -32,7 +29,7 @@
</el-button>
</div>
</template>
</el-dialog>
</safe-dialog>
</template>
<script setup>
@@ -44,9 +41,6 @@
const instance = getCurrentInstance();
const $message = instance.proxy.$message;
const beforeDialogClose = inject('beforeDialogClose');
const dialogMouseDown = inject('dialogMouseDown');
const dialogMouseUp = inject('dialogMouseUp');
const openExternalLink = inject('openExternalLink');
const props = defineProps({