mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-01-18 15:26:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add first time save codec selector

Browse Source 
Fix status bar overflow
This commit is contained in:
JannisX11 2023-02-20 22:18:09 +01:00
parent 5b27e8363e
commit d8d20e09c0
4 changed files with 67 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
css/window.css
View File

@ -763,6 +763,7 @@
}
#status_bar .status_bar_modifier_key {
flex-grow: 0.06;
flex-shrink: 1;
text-align: center;
padding-top: 2px;
font-size: 0.92em;

68
js/io/io.js
View File

@ -728,24 +728,52 @@ BARS.defineActions(function() {
})
}
})
//Export
// Smart Save
new Action('export_over', {
icon: 'save',
category: 'file',
keybind: new Keybind({key: 's', ctrl: true}),
click: function () {
click: async function() {
if (isApp) {
saveTextures()
if (Format) {
let export_codec = Format.codec;
if (Project.save_path) {
Codecs.project.write(Codecs.project.compile(), Project.save_path);
}
if (Project.export_path && Format.codec && Format.codec.compile) {
Format.codec.write(Format.codec.compile(), Project.export_path)
} else if (Format.codec && Format.codec.export && !Project.save_path) {
Format.codec.export()
if (Project.export_path && export_codec?.compile) {
export_codec.write(export_codec.compile(), Project.export_path)
} else if (export_codec?.export && !Project.save_path) {
if (export_codec.id === 'project') {
export_codec.export();
} else {
let codec = await new Promise(resolve => Blockbench.showMessageBox({
translateKey: 'save_codec_selector',
icon: 'save',
commands: {
project: 'message.save_codec_selector.project_file',
[export_codec.id]: export_codec.name || 'Default Format',
both: 'message.save_codec_selector.both',
},
buttons: ['dialog.cancel']
}, resolve));
if (codec == 'both') {
Codecs.project.export();
export_codec.export();
} else if (codec) {
Codecs[codec].export();
}
}
} else if (!Project.save_path) {
Project.saved = true;
if (Format.edit_mode) {
Codecs.project.export();
} else {
Project.saved = false;
}
}
}
if (Format.animation_mode && Format.animation_files && Animation.all.length) {
@ -754,7 +782,31 @@ BARS.defineActions(function() {
} else {
saveTextures()
if (Format.codec && Format.codec.export) {
Format.codec.export()
let codec = await new Promise(resolve => Blockbench.showMessageBox({
translateKey: 'save_codec_selector',
icon: 'save',
commands: {
project: 'message.save_codec_selector.project_file',
[export_codec.id]: export_codec.name || 'Default Format',
both: 'message.save_codec_selector.both',
},
buttons: ['dialog.cancel']
}, resolve));
if (codec == 'both') {
Codecs.project.export();
export_codec.export();
} else if (codec) {
Codecs[codec].export();
}
} else if (Format.edit_mode) {
Codecs.project.export();
} else {
Project.saved = false;
}
}
}

2
js/webpack/bundle.js
View File

File diff suppressed because one or more lines are too long

5
lang/en.json
View File

@ -288,6 +288,11 @@
"message.delete_animation.title": "Delete Animation",
"message.delete_animation.message": "The animation was removed from Blockbench. Do you also want to delete the animation from the file that is was saved in?",
"message.save_codec_selector.title": "Save Model",
"message.save_codec_selector.message": "Select a format to save the model in.",
"message.save_codec_selector.project_file": "Blockbench Project (.bbmodel)",
"message.save_codec_selector.both": "Both",
"message.display_skin.title": "Display Skin",
"message.display_skin.message": "Select a skin file from your computer or enter a player name",