3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 04:31:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge BS 1.7.7.89

Browse source 
# Conflicts:
#	bbl/i18n/ko/BambuStudio_ko.po
#	localization/i18n/OrcaSlicer.pot
#	localization/i18n/de/OrcaSlicer_de.po
#	localization/i18n/en/OrcaSlicer_en.po
#	localization/i18n/es/OrcaSlicer_es.po
#	localization/i18n/fr/OrcaSlicer_fr.po
#	localization/i18n/hu/OrcaSlicer_hu.po
#	localization/i18n/it/OrcaSlicer_it.po
#	localization/i18n/ja/OrcaSlicer_ja.po
#	localization/i18n/nl/OrcaSlicer_nl.po
#	localization/i18n/sv/OrcaSlicer_sv.po
#	localization/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/ja/BambuStudio.mo
#	resources/i18n/ko/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json
#	src/OrcaSlicer.cpp
#	src/libnest2d/include/libnest2d/selections/firstfit.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/slic3r/GUI/CalibrationWizardPresetPage.cpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/PartPlate.hpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
This commit is contained in:
SoftFever 2023-10-21 19:41:49 +08:00
commit a7729ca83f
213 changed files with 2090 additions and 649 deletions
Download patch file Download diff file Expand all files Collapse all files

19
resources/web/homepage/js/home.js
View file

@ -1,5 +1,6 @@
/*var TestData={"sequence_id":"0","command":"studio_send_recentfile","data":[{"path":"D:\\work\\Models\\Toy\\3d-puzzle-cube-model_files\\3d-puzzle-cube.3mf","time":"2022\/3\/24 20:33:10"},{"path":"D:\\work\\Models\\Art\\Carved Stone Vase - remeshed+drainage\\Carved Stone Vase.3mf","time":"2022\/3\/24 17:11:51"},{"path":"D:\\work\\Models\\Art\\Kity & Cat\\Cat.3mf","time":"2022\/3\/24 17:07:55"},{"path":"D:\\work\\Models\\Toy\\鐩村墤.3mf","time":"2022\/3\/24 17:06:02"},{"path":"D:\\work\\Models\\Toy\\minimalistic-dual-tone-whistle-model_files\\minimalistic-dual-tone-whistle.3mf","time":"2022\/3\/22 21:12:22"},{"path":"D:\\work\\Models\\Toy\\spiral-city-model_files\\spiral-city.3mf","time":"2022\/3\/22 18:58:37"},{"path":"D:\\work\\Models\\Toy\\impossible-dovetail-puzzle-box-model_files\\impossible-dovetail-puzzle-box.3mf","time":"2022\/3\/22 20:08:40"}]};*/
var m_HotModelList=null;
function OnInit()
{
@ -22,7 +23,7 @@ var RightBtnFilePath='';
var MousePosX=0;
var MousePosY=0;
var sImages = {};
function Set_RecentFile_MouseRightBtn_Event()
{
$(".FileItem").mousedown(
@ -123,7 +124,17 @@ function HandleStudio( pVal )
else if( strCmd=="modelmall_model_advise_get")
{
//alert('hot');
ShowStaffPick( pVal['hits'] );
if( m_HotModelList!=null )
{
let SS1=JSON.stringify(pVal['hits']);
let SS2=JSON.stringify(m_HotModelList);
if( SS1==SS2 )
return;
}
m_HotModelList=pVal['hits'];
ShowStaffPick( m_HotModelList );
}
}
@ -477,10 +488,10 @@ function ShowStaffPick( ModelList )
let ModelID=OnePickModel['design']['id'];
let ModelName=OnePickModel['design']['title'];
let ModelCover=OnePickModel['design']['cover'];
let ModelCover=OnePickModel['design']['cover']+'?image_process=resize,w_200/format,webp';
let DesignerName=OnePickModel['design']['designCreator']['name'];
let DesignerAvatar=OnePickModel['design']['designCreator']['avatar'];
let DesignerAvatar=OnePickModel['design']['designCreator']['avatar']+'?image_process=resize,w_32/format,webp';
strPickHtml+='<div class="HotModelPiece swiper-slide" onClick="OpenOneStaffPickModel('+ModelID+')" >'+
'<div class="HotModel_Designer_Info"><img src="'+DesignerAvatar+'" /><span class="TextS2">'+DesignerName+'</span></div>'+

2
resources/web/model/index.html
View file

@ -50,7 +50,7 @@
<div id="Model_Basic" class="InfoBlock">
<div id="Model_Name_Area" class="Text_TitleBoard">
<div id="Model_Name_Line" class="Text_TitleArea">
<div class="Text_Title" ><span class="trans" tid='t98' >Model name</span><span>:</span><span id="ModelName" style="margin-left: 8px;">xxxxxxxxxx</span></div>
<div class="Text_Title" id="ModelNameBar" ><div class="trans" tid='t98' >Model name</div><div>:</div><div title="xxxxxxxxxx" id="ModelName" style="margin-left: 8px;">xxxxxxxxxx</div></div>
<div><span id="ModelAuthorType" class="trans" tid='t92'>Model Author</span><span>:</span><span id="ModelAuthorName" style="margin-left: 8px;" class="Text_Value">xxxxxxx</span></div>
</div>
<div id="ModelLicenceImg"><img src="img/by-nc-nd.png"></div>

26
resources/web/model/model.css
View file

@ -81,7 +81,7 @@ body
{
font-size: 16px;
font-weight: 700;
color: black;
color: black;
}
.Text_Value
@ -103,9 +103,31 @@ body
.Text_TitleArea div
{
height: 32px;
line-height: 32px
line-height: 32px;
}
#Model_Name_Line
{
width: 800px;
}
#ModelNameBar
{
width: 100%;
display: flex;
overflow:hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
#ModelName
{
overflow:hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.Block_BKGA
{
background-color: white;

1
resources/web/model/model.js
View file

@ -209,6 +209,7 @@ function ShowModelInfo( pModel )
SendWXDebugInfo("Model Name: "+sModelName);
$('#ModelName').html(sModelName);
$('#ModelName').attr('title',sModelName);
$('#ModelAuthorName').html(sModelAuthor);
switch(UploadType)

2
resources/web/model/test.js
View file

@ -1,6 +1,6 @@
var TestProjectData={
"model": {
"name": "xxxxxxxxxxxxxxxxxxxxxxxxx easy print",
"name": "xxxxxxxxxxxxxxxxxxxxxxxxx easy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy printeasy print",
"author": "Zorro Zhang",
"upload_type": "share",
"license": "CC0",