diff --git a/resources/web/homepage/css/home.css b/resources/web/homepage/css/home.css index 3092b41c2..f52e07fdf 100644 --- a/resources/web/homepage/css/home.css +++ b/resources/web/homepage/css/home.css @@ -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; - -} \ No newline at end of file diff --git a/resources/web/homepage/index.html b/resources/web/homepage/index.html index 4657664e9..6a9411e77 100644 --- a/resources/web/homepage/index.html +++ b/resources/web/homepage/index.html @@ -76,42 +76,6 @@
-
-
-
Christmas Cabin
-
-
- -
-
-
recent open
diff --git a/resources/web/homepage/js/home.js b/resources/web/homepage/js/home.js index 662b85735..442721416 100644 --- a/resources/web/homepage/js/home.js +++ b/resources/web/homepage/js/home.js @@ -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'+ - '
'+ - '
'+OneCabin.name+'
'+ - '
'; - - 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) ); -} - - diff --git a/resources/web/homepage/model/Bambu Lab Christmas Cabin P1P.gcode.3mf b/resources/web/homepage/model/Bambu Lab Christmas Cabin P1P.gcode.3mf deleted file mode 100644 index a0eb821bd..000000000 Binary files a/resources/web/homepage/model/Bambu Lab Christmas Cabin P1P.gcode.3mf and /dev/null differ diff --git a/resources/web/homepage/model/Bambu Lab Christmas Cabin X1 X1C.gcode.3mf b/resources/web/homepage/model/Bambu Lab Christmas Cabin X1 X1C.gcode.3mf deleted file mode 100644 index d2a4a5f64..000000000 Binary files a/resources/web/homepage/model/Bambu Lab Christmas Cabin X1 X1C.gcode.3mf and /dev/null differ diff --git a/resources/web/homepage/model/Cover_P1P.png b/resources/web/homepage/model/Cover_P1P.png deleted file mode 100644 index 145c81aa8..000000000 Binary files a/resources/web/homepage/model/Cover_P1P.png and /dev/null differ diff --git a/resources/web/homepage/model/Cover_X1_X1C.png b/resources/web/homepage/model/Cover_X1_X1C.png deleted file mode 100644 index d1e8cd3b7..000000000 Binary files a/resources/web/homepage/model/Cover_X1_X1C.png and /dev/null differ diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 362db930b..4fc0b9715 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -3503,18 +3503,6 @@ std::string GUI_App::handle_web_request(std::string cmd) wxLaunchDefaultBrowser(path.value()); } } - } - 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 path = data_node.get_optional("file"); - if (path.has_value()) - { - std::string Fullpath = resources_dir() + "/web/homepage/model/" + path.value(); - - this->request_open_project(Fullpath); - } - } } }