Mirrors/WebTools-NG
2
0
Fork 0
mirror of https://github.com/WebTools-NG/WebTools-NG synced 2025-02-17 03:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into #507-Download-Module

Browse source
This commit is contained in:
Tommy Mikkelsen 2022-07-17 23:20:13 +02:00
commit 1b7a5078bb
3 changed files with 32 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -21,6 +21,7 @@
* [#531 Date-Time settings missing from settings](https://github.com/WebTools-NG/WebTools-NG/issues/531) (Bug fix)
* [#530 ET Suggested file naming - incorrect output](https://github.com/WebTools-NG/WebTools-NG/issues/530) (Bug fix)
* [#538 ET Library output needs the Library Title in 1st Column](https://github.com/WebTools-NG/WebTools-NG/issues/538) (Bug fix)
* [#537 ET Custom Level - blank with no name](https://github.com/WebTools-NG/WebTools-NG/issues/537) (Bug fix)
## V0.3.17 (20220601)

30
src/components/modules/ExportTools/Custom/custom.vue
View file

@ -18,7 +18,6 @@
name="mediaType">
</b-form-select>
</b-form-group>
<div> <!-- Select Custom Level -->
<b-form-group id="etLevelGroup" v-bind:label="$t('Modules.ET.Custom.CustomLevel')" label-size="lg" label-class="font-weight-bold pt-0" v-b-tooltip.hover="$t('Modules.ET.Custom.TT-ETEditLevel')">
<b-form-select
@ -33,14 +32,12 @@
</b-form-select>
</b-form-group>
</div>
<b-modal ref="showNewLevel" hide-footer v-bind:title=this.customTitle >
<b-modal ref="showNewLevel" hide-footer v-bind:title=this.customTitle @hide="newLevelHidden">
<div class="d-block text-center">
<b-form-input v-model="NewLevelName" v-bind:placeholder=this.NewLevelInputTxt ></b-form-input>
</div>
<b-button class="mt-3" variant="outline-primary" block @click="addNewLevel">{{ this.NewLevelSaveTxt }}</b-button>
</b-modal>
<b-modal ref="confirmDeleteLevel" hide-footer v-bind:title=this.deleteLevel >
<div class="d-block text-center">
{{ $t('Modules.ET.Custom.confirmDelete', [this.selCustLevel]) }}
@ -48,15 +45,12 @@
<b-button class="mt-3" variant="info" block @click="deleteClose">{{ $t('Modules.ET.Custom.Cancel') }}</b-button>
<b-button class="mt-3" variant="danger" block @click="deleteCustomLevel">{{ $t('Modules.ET.Custom.Delete') }}</b-button>
</b-modal>
<!-- Buttons -->
<div id="buttons" class="text-center">
<div id="buttons" class="text-center"> <!-- Buttons -->
<b-button-group >
<b-button variant="success" class="mr-1" @click="saveCustomLevel"> {{ $t('Modules.ET.Custom.btnSave') }} </b-button>
<b-button variant="success" class="mr-1" :disabled="this.btnSaveEnabled == 0" @click="saveCustomLevel"> {{ $t('Modules.ET.Custom.btnSave') }} </b-button>
<b-button variant="danger" class="mr-1" :disabled="this.btnDeleteEnabled == 0" @click="confirmDeleteLevel">{{ $t('Modules.ET.Custom.btnDelete') }}</b-button>
</b-button-group>
</div>
<b-container fluid>
<b-row>
<b-col cols="6">
@ -85,10 +79,6 @@
</b-col>
</b-row>
</b-container>
</b-container>
</template>
@ -130,11 +120,15 @@
delayedDragging: false,
fieldList: [],
btnDeleteEnabled: false,
btnSaveEnabled: false,
optionsLevels: null,
resultList: []
}
},
watch: {
selCustLevel(){
this.btnSaveEnabled = ( (this.selCustLevel != "") && ( this.selCustLevel != "NewLevel"));
},
isDragging(newValue) {
if (newValue) {
this.delayedDragging = true;
@ -164,6 +158,12 @@
this.genExportLevels();
},
methods: {
newLevelHidden(){
if (this.NewLevelName === '')
{
this.selCustLevel = '';
}
},
getCustomLevel() {
log.debug(`Customlevel ${this.selCustLevel} selected`);
if (this.selCustLevel != 'NewLevel'){
@ -319,13 +319,13 @@
wtconfig.delete(`ET.CustomLevels.${this.selMediaType}.level.${this.selCustLevel}`);
wtconfig.delete(`ET.CustomLevels.${this.selMediaType}.Posters.${this.selCustLevel}`);
wtconfig.delete(`ET.CustomLevels.${this.selMediaType}.Art.${this.selCustLevel}`);
wtconfig.delete(`ET.CustomLevels.${this.selMediaType}.Include.${this.selCustLevel}`);
this.genExportLevels();
this.resultList = [];
},
saveCustomLevel() {
let result = []
let bExportArt = false;
let bExportPosters = false;
for(var k in this.resultList) {
if (this.resultList[k].name == 'Export Posters')
@ -359,6 +359,7 @@
this.$refs['confirmDeleteLevel'].show();
},
selectExportLevel: async function(value) {
// this.btnSaveEnabled = ( this.selCustLevel != "");
log.info(`Custom ExportLevel selected as: ${value}`)
if ( value == 'NewLevel') {
// Create new level
@ -368,6 +369,7 @@
else {
this.btnDeleteEnabled = true;
this.selCustLevel = value;
//this.btnSaveEnabled = ( this.selCustLevel != "");
}
this.resultList = [];
await this.genExportLevels();

49
src/components/modules/Main/Settings/SettingsGeneral.vue
View file

@ -22,40 +22,27 @@
</b-input-group>
<b-input-group id="LogLevelSizeGrp" :prepend="$t('Modules.GlobalSettings.LogSize')" class="mt-3">
<b-tooltip target="LogLevelSizeGrp" triggers="hover">
{{ $t('Modules.GlobalSettings.RestartNeeded') }}
</b-tooltip>
<b-form-select id="LogLevelSize" name="LogLevelSize" type="text" class="form-control" v-model="LogLevelSize" :disabled=false :maxlength=4 v-on:change="setLogLevelSize" :options="LogLevelSizes"></b-form-select>
<b-tooltip target="LogLevelSizeGrp" triggers="hover">
{{ $t('Modules.GlobalSettings.RestartNeeded') }}
</b-tooltip>
<b-form-select id="LogLevelSize" name="LogLevelSize" type="text" class="form-control" v-model="LogLevelSize" :disabled=false :maxlength=4 v-on:change="setLogLevelSize" :options="LogLevelSizes"></b-form-select>
</b-input-group>
<b-input-group id="BetaTesterGrp" :prepend="$t('Modules.GlobalSettings.BetaTester')" class="mt-3">
<b-tooltip target="BetaTesterGrp" triggers="hover">
{{ $t('Modules.GlobalSettings.TTBetaTester') }}
</b-tooltip>
<b-form-select id="BetaTester" name="BetaTester" type="text" class="form-control" v-model="BetaTester" :disabled=false :maxlength=2 v-on:change="setBeta" :options="BetaLevels"></b-form-select>
<b-tooltip target="BetaTesterGrp" triggers="hover">
{{ $t('Modules.GlobalSettings.TTBetaTester') }}
</b-tooltip>
<b-form-select id="BetaTester" name="BetaTester" type="text" class="form-control" v-model="BetaTester" :disabled=false :maxlength=2 v-on:change="setBeta" :options="BetaLevels"></b-form-select>
</b-input-group>
<b-input-group id="Update" :prepend="$t('Modules.GlobalSettings.Update')" class="mt-3">
<b-tooltip target="Update" triggers="hover">
{{ $t('Modules.GlobalSettings.TTUpdate') }}
</b-tooltip>
<b-form-select id="Update" name="Update" type="text" class="form-control" v-model="Update" :disabled=false :maxlength=2 v-on:change="setUpdate" :options="UpdateLevels">
{{ this.getUpdate() }}
</b-form-select>
<b-tooltip target="Update" triggers="hover">
{{ $t('Modules.GlobalSettings.TTUpdate') }}
</b-tooltip>
<b-form-select id="Update" name="Update" type="text" class="form-control" v-model="Update" :disabled=false :maxlength=2 v-on:change="setUpdate" :options="UpdateLevels">
{{ this.getUpdate() }}
</b-form-select>
</b-input-group>
<b-input-group id="LocalDateTimeGrp" :prepend="$t('Modules.GlobalSettings.LocalDateTime')" class="mt-3">
<b-form-select id="LocalDateTime" name="LocalDateTime" type="text" class="form-control" v-model="LocalDateTime" :disabled=false :maxlength=2 v-on:change="setPrefs($event, 'General.DateTimeFormat')" :options="LocalDateTimeOptions"></b-form-select>
</b-input-group>
<b-input-group id="DateOptionGrp" :prepend="$t('Modules.GlobalSettings.DateStyle')" class="mt-3">
<b-form-select id="DateOption" name="DateOption" type="text" class="form-control" v-model="DateOption" :disabled=false :maxlength=2 v-on:change="setPrefs($event, 'General.DateOption')" :options="DateTimeOptions"></b-form-select>
</b-input-group>
<b-input-group id="TimeOptionGrp" :prepend="$t('Modules.GlobalSettings.TimeStyle')" class="mt-3">
<b-form-select id="TimeOption" name="TimeOption" type="text" class="form-control" v-model="TimeOption" :disabled=false :maxlength=2 v-on:change="setPrefs($event, 'General.TimeOption')" :options="DateTimeOptions"></b-form-select>
</b-input-group>
<br>
<!-- Buttons -->
<div class="buttons">
@ -73,7 +60,6 @@
<script>
import i18n from '../../../../i18n';
import { wtconfig } from '../../General/wtutils';
import { time } from '../../General/time';
const log = require("electron-log");
export default {
@ -83,12 +69,7 @@
LogLevelConsole: wtconfig.get('Log.consoleLevel'),
LogLevelSize: this.getLogFileSize(),
BetaTester: this.getBeta(),
Update: this.getUpdate(),
LocalDateTimeOptions: time.countries,
DateTimeOptions: [ i18n.t("Common.DateTime.Full"), i18n.t("Common.DateTime.Long"), i18n.t("Common.DateTime.Medium"), i18n.t("Common.DateTime.Short")],
LocalDateTime: wtconfig.get('General.DateTimeFormat'),
DateOption: wtconfig.get('General.DateOption'),
TimeOption: wtconfig.get('General.TimeOption')
Update: this.getUpdate()
};
},
created() {