3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-15 18:58:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

remove: Revert "NEW: add christmas cabin"

Browse source 
This reverts commit 19767aebb827abb83229e100a5ae38ff76de6478.

Change-Id: I2ccceae409a16598658a2b35ec56b11617dd0afa
This commit is contained in:
养乐多 2022-12-12 19:06:02 +08:00 • committed by Lane.Wei
parent 32b46292b9
commit b5967505bd
8 changed files with 1 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

24
resources/web/homepage/css/home.css
View file

@ -605,28 +605,4 @@ body
font-size: 14px;
}
/*------Christmas cabin---*/
#ChristmasArea
{
margin-top: 10px;
display: flex;
flex-direction: column;
}
#ChristmasTitleBlock
{
display:flex;
align-items: center;
padding: 6px;
border-bottom-width: 1px;
border-bottom-style: solid;
}
#CabinList
{
display: flex;
flex-wrap: wrap;
align-content: flex-start;
overflow-y: auto;
}

36
resources/web/homepage/index.html
View file

@ -76,42 +76,6 @@
<div id="DebugText"></div>
<div id="ChristmasArea">
<div id="ChristmasTitleBlock">
<div id="ChristmasTitle" class="Content-Title trans TextS1" tid="t92">Christmas Cabin</div>
</div>
<div id="CabinList">
<!-- <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
<div class="FileImg"><img src="img/d.png"/></div>
<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
</div>
<div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
<div class="FileImg"><img src="img/d.png"/></div>
<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
</div>
<div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
<div class="FileImg"><img src="img/d.png"/></div>
<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
</div>
<div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
<div class="FileImg"><img src="img/d.png"/></div>
<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
</div>
<div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
<div class="FileImg"><img src="img/d.png"/></div>
<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
</div>
<div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
<div class="FileImg"><img src="img/d.png"/></div>
<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
</div>
<div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
<div class="FileImg"><img src="img/d.png"/></div>
<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
</div> -->
</div>
</div>
<div id="RecentFileArea">
<div id="RecentTitleBlock">
<div id="RecentTitle" class="Content-Title trans TextS1" tid="t35">recent open</div>

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

@ -12,9 +12,6 @@ function OnInit()
SendMsg_GetLoginInfo();
SendMsg_GetRecentFile();
//-----Christmas-----
ShowCabin();
}
//------最佳打开文件的右键菜单功能----------
@ -25,7 +22,7 @@ var MousePosY=0;
function Set_RecentFile_MouseRightBtn_Event()
{
$("#FileList .FileItem").mousedown(
$(".FileItem").mousedown(
function(e)
{
//FilePath
@ -404,66 +401,3 @@ function OpenWikiUrl( strUrl )
//---------------Global-----------------
window.postMessage = HandleStudio;
//---------------Christma cabin
var CCabin={
"model":[
{
"name":"Christmas Cabin X1 X1C",
"icon":"Cover_X1_X1C.png",
"file":"Bambu Lab Christmas Cabin X1 X1C.gcode.3mf"
},
{
"name":"Christmas Cabin P1P",
"icon":"Cover_P1P.png",
"file":"Bambu Lab Christmas Cabin P1P.gcode.3mf"
}
]
};
function ShowCabin()
{
let nCabin=CCabin.model.length;
if(nCabin==0)
{
$('#CabinList').html('');
$('#ChristmasArea').hide();
return;
}
let strHtml='';
for(let m=0;m<nCabin;m++)
{
let OneCabin=CCabin.model[m];
let OneHtml='<div class="FileItem" onClick="OnOpenCabin(\''+OneCabin.file+'\')" >'+
'<div class="FileImg"><img src="model/'+OneCabin.icon+'"/></div>'+
'<div class="FileName TextS1">'+OneCabin.name+'</div>'+
'</div>';
strHtml+=OneHtml;
}
$('#CabinList').html(strHtml);
$('#ChristmasArea').show();
$('#ChristmasArea').css('display','flex');
}
function OnOpenCabin( cabinfile )
{
//alert(cabinfile);
var tSend={};
tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="homepage_open_ccabin";
tSend['data']={};
tSend['data']['file']=cabinfile;
SendWXMessage( JSON.stringify(tSend) );
}

BIN
resources/web/homepage/model/Bambu Lab Christmas Cabin P1P.gcode.3mf
View file

Binary file not shown.

BIN
resources/web/homepage/model/Bambu Lab Christmas Cabin X1 X1C.gcode.3mf
View file

Binary file not shown.

BIN
resources/web/homepage/model/Cover_P1P.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 938 KiB

BIN
resources/web/homepage/model/Cover_X1_X1C.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 941 KiB

12
src/slic3r/GUI/GUI_App.cpp
View file

@ -3504,18 +3504,6 @@ std::string GUI_App::handle_web_request(std::string cmd)
}
}
}
else if (command_str.compare("homepage_open_ccabin") == 0) {
if (root.get_child_optional("data") != boost::none) {
pt::ptree data_node = root.get_child("data");
boost::optional<std::string> path = data_node.get_optional<std::string>("file");
if (path.has_value())
{
std::string Fullpath = resources_dir() + "/web/homepage/model/" + path.value();
this->request_open_project(Fullpath);
}
}
}
}
}