Mirrors/WebTools-NG
2
0
Fork 0
mirror of https://github.com/WebTools-NG/WebTools-NG synced 2024-11-22 11:03:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

#488 #487 Stupid AlertBox

Browse source
This commit is contained in:
Tommy Mikkelsen 2022-05-13 00:08:07 +02:00
parent 80da47df81
commit 92b5e6e2f2
5 changed files with 58 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -12,6 +12,7 @@
**Changes**:
* [#486 ET Modules Year on shows not working](https://github.com/WebTools-NG/WebTools-NG/issues/486)
* [#488 ExportTools Settings cannot input any text at all](https://github.com/WebTools-NG/WebTools-NG/issues/488)
## V0.3.16 (20220511)

1
public/locales/en.json
View file

@ -166,6 +166,7 @@
"Name": "ExportTools",
"ErrorServer": "No server",
"Settings": {
"Name": "@:Modules.ET.Name @:Modules.ET.Settings.Settings",
"Settings": "Settings",
"Description": "Here you can define the settings for @:Modules.ET.Name",
"ArraySep": "Delimiter for multiple info in same field",

61
src/components/layout/script/menubar.js
View file

@ -2,7 +2,7 @@ import i18n from '../../../i18n'
import { shell, clipboard } from 'electron'
import { wtutils, dialog } from '../../modules/General/wtutils';
const aboutInformation =
const aboutInformation =
(i18n.t("Common.Menu.Help.menuAboutText.menuAboutVersion") +": " + wtutils.AppVersion) + '\n' +
(i18n.t('Common.Menu.Help.menuAboutText.menuAboutPlatform') +": " + wtutils.Platform) + '\n' +
(i18n.t('Common.Menu.Help.menuAboutText.menuAboutArchitecture') +": " + process.arch)
@ -11,31 +11,31 @@ const aboutInformation =
const menuTemplate = [
{
// File menu
label: i18n.t("Common.Menu.File.menuFile"),
label: i18n.t("Common.Menu.File.menuFile"),
submenu:
[
[
wtutils.isMac ?
{
{
label: i18n.t("Common.Menu.File.menuOpenLogDir"),
click: () => { shell.openPath(wtutils.LogMac) }
} :
{
...wtutils.isLinux ?
{
label: i18n.t("Common.Menu.File.menuOpenLogDir"),
click: () => { shell.openPath(wtutils.LogLinux) }
click: () => { shell.openPath(wtutils.LogMac) }
} :
{
...wtutils.isLinux ?
{
label: i18n.t("Common.Menu.File.menuOpenLogDir"),
click: () => { shell.openPath(wtutils.LogLinux) }
} : {
...wtutils.isWindows ?
{
...wtutils.isWindows ?
{
label: i18n.t("Common.Menu.File.menuOpenLogDir"),
click: () => { shell.openPath(wtutils.LogWin) }
click: () => { shell.openPath(wtutils.LogWin) }
} : {}
},
},
{
label: i18n.t("Common.Menu.File.menuQuit"),
role: 'quit'
}
}
]
},
{
@ -52,7 +52,7 @@ const menuTemplate = [
role: 'redo'
},
{
type: 'separator'
type: 'separator'
},
{
label: i18n.t("Common.Menu.Edit.menuCut"),
@ -90,15 +90,15 @@ const menuTemplate = [
role: 'forceReload'
},
wtutils.isDev ?
{
{
label: i18n.t("Common.Menu.View.menuToggleDeveloperTools"),
role: 'toggleDevTools'
}: {
label: "nothere",
visible: false
visible: false
},
{
type: 'separator'
type: 'separator'
},
{
label: i18n.t("Common.Menu.View.menuActualSize"),
@ -125,23 +125,23 @@ const menuTemplate = [
[
{
label: i18n.t("Common.Menu.Help.menuForum"),
click: () => { shell.openExternal("https://forums.plex.tv/t/598539") }
click: () => { shell.openExternal("https://forums.plex.tv/t/598539") }
},
{
label: i18n.t("Common.Menu.Help.menuGithub"),
click: () => { shell.openExternal("https://github.com/WebTools-NG/WebTools-NG") }
label: i18n.t("Common.Menu.Help.menuGithub"),
click: () => { shell.openExternal("https://github.com/WebTools-NG/WebTools-NG") }
},
{
label: i18n.t("Common.Menu.Help.menuManual"),
click: () => { shell.openExternal("https://github.com/WebTools-NG/WebTools-NG/wiki") }
click: () => { shell.openExternal("https://github.com/WebTools-NG/WebTools-NG/wiki") }
},
{
{
label: i18n.t("Common.Menu.Help.menuAbout"),
click: () => {
dialog.AboutWindow(
i18n.t("Common.Menu.Help.menuAbout"),
i18n.t("Common.Ok"),
i18n.t("Common.Copy"),
click: () => {
dialog.AboutWindow(
i18n.t("Common.Menu.Help.menuAbout"),
i18n.t("Common.Ok"),
i18n.t("Common.Copy"),
aboutInformation).then(
result => {
if (result.response === 1) {
@ -150,7 +150,7 @@ const menuTemplate = [
}
}
)
}
}
}
]
}
@ -158,4 +158,3 @@ const menuTemplate = [
export default menuTemplate;

11
src/components/modules/ExportTools/Settings/settings.vue
View file

@ -1,6 +1,7 @@
<template>
<b-container fluid>
<div class="col-lg-10 col-md-12 col-xs-12">
<p id="demo"></p>
<h1>{{ $t("Modules.ET.Settings.Name") }}</h1>
<p>{{ $t("Modules.ET.Settings.Description") }}</p>
<b-input-group id="ArraySepGrp" :prepend="$t('Modules.ET.Settings.ArraySep')" class="mt-3">
@ -45,7 +46,7 @@
:options="cbOptions"
v-model="cbSelected"
@change.native="filterTable">
</b-form-checkbox-group>
</b-form-checkbox-group>
</b-form-group>
<b-form-group id="etSugMovieID" v-bind:label="$t('Modules.ET.Settings.MoviesUseId')" label-size="lg" label-class="font-weight-bold pt-0">
<b-tooltip target="etSugMovieID" triggers="hover">
@ -80,7 +81,8 @@
{
this.ColumnSep = wtconfig.get('ET.ColumnSep');
}
alert('For this version, export to XLSX is currently disabled');
// alert('For this version, export to XLSX is currently disabled');
this.showAlert();
},
data() {
return {
@ -108,6 +110,9 @@
};
},
methods: {
showAlert(){
dialog.ShowMsg( i18n.t("Modules.ET.Name"), i18n.t("Common.Ok"), i18n.t("Common.AppName"), 'For this version, export to XLSX is currently disabled', 'info');
},
getDefaults(){
const cbItems = ["ExpCSV","ExpXLSX", "OrgTitleNull", "SortTitleNull", "suggestedFileNoExtra", "suggestedUseOrigenTitle"];
for(let i = 0; i < cbItems.length; i++){
@ -149,7 +154,7 @@
wtconfig.set('ET.ColumnSep', this.ColumnSep)
}
}
},
},
setArraySep: function(){
wtconfig.set('ET.ArraySep', this.ArraySep)
},

20
src/components/modules/General/wtutils.js
View file

@ -3,8 +3,6 @@ This file contains different functions and methods
that we use in our solution.
*/
//import i18n from '../../../i18n';
//import storeStatus from '../../store';
//storeStatus
@ -544,6 +542,24 @@ const dialog = new class Dialog {
return aboutWindow
}
ShowMsg(Title, OKLabel, MsgHeader, Msg, Type)
{
log.debug(`[wtutils.js] (ShowMsg) Open ShowMsg Dialog`);
const {remote} = require('electron'),
dialog = remote.dialog,
WIN = remote.getCurrentWindow();
let options = {
buttons: [OKLabel],
title: MsgHeader,
message: Title,
detail: Msg,
type: Type,
noLink: true
}
let showMsgWindow = dialog.showMessageBox(WIN, options)
return showMsgWindow
}
OpenDirectory(Title, OKLabel)
{
log.debug('Start OpenDirectory Dialog')