diff --git a/resources/web/data/text.js b/resources/web/data/text.js index 32064f6f7..cf11ee13b 100644 --- a/resources/web/data/text.js +++ b/resources/web/data/text.js @@ -1225,116 +1225,6 @@ var LangText={ "t115":"Batch", "t116":"Probeer het opnieuw" }, - "uk_UA": { - "t1": "Вітаємо в Bambu Studio!", - "t2": "Для налаштування Bambu Studio необхідно пройти кілька етапів. Почнімо!", - "t3": "Угода користувача", - "t4": "Відмовитися", - "t5": "Прийняти", - "t6": "Ми просимо вашої допомоги, щоб покращити друк. Ласкаво просимо до нашої програми підвищення якості обслуговування клієнтів", - "t7": "Дозволити відправку анонімних даних для удосконалення програми", - "t8": "Назад", - "t9": "Далі", - "t10": "Вибір принтера", - "t11": "Всі", - "t12": "Очистити", - "t13": "мм сопло", - "t14": "Вибір пластикової нитки", - "t15": "Принтер", - "t16": "Тип стрижня", - "t17": "Виробник", - "t18": "помилка", - "t19": "Має бути вибрана принаймні одна пластикова нитка.", - "t20": "Вибрати пластикові нитки за замовчуванням?", - "t21": "так", - "t22": "ні", - "t23": "Інформація про версію", - "t24": "Почати", - "t25": "Закінчити", - "t26": "Увійти", - "t27": "Реєстрація", - "t28": "Моделі", - "t29": "Mall", - "t30": "Інструкції", - "t31": "Новий проєкт", - "t32": "Створити новий проєкт", - "t33": "Відкрити проєкт", - "t34": "точка доступу", - "t35": "Нещодавно відкриті", - "t36": "ОК", - "t37": "Має бути вибраний принаймні один принтер.", - "t38": "Скасувати", - "t39": "Прийняти", - "t40": "Мережа відключена. Будь ласка, перевірте з'єднання та спробуйте знову.", - "t47": "Будь ласка, виберіть регіон входу", - "t48": "Азійсько-Тихоокеанський регіон", - "t49": "Китай", - "t50": "Вийти", - "t52": "Пропустити", - "t53": "Увійти", - "t54": "У спільноті 3D-друкарів для виявлення найкращих параметрів нарізки та покращення друку ми вчимося на успіхах та невдачах один одного. Bambu Studio слідує тому ж принципу і використовує машинне навчання для покращення своєї роботи на основі успішних та невдалих друків наших користувачів. Ми навчаємо Bambu Studio бути розумнішим на основі реальних даних. За вашою згодою ця служба отримає доступ до ваших журналів помилок та журналів використання, в яких містяться дані, описані в ", - "t55": "політиці конфіденційності", - "t56": ". Ми не збираємо жодних особистих даних, які можуть безпосередньо або побічно ідентифікувати окрему особу, включно, серед іншого, з іменами, адресами, платіжною інформацією або телефонними номерами. Погоджуючись на включення даної служби, ви погоджуєтеся з цими умовами та заявою про політику конфіденційності.", - "t57": "", - "t58": "", - "t59": ".", - "t60": "Європа", - "t61": "Північна Америка", - "t62": "Інший", - "t63": "Після зміни регіону відбудеться вихід з акаунта. Будь ласка, увійдіть пізніше.", - "t64": "Мережевий плагін Bambu", - "t65": "Відправлення завдання на друк через WLAN", - "t66": "Повне дистанційне керування", - "t67": "Перегляд прямої трансляції з камери", - "t68": "Синхронізація даних користувача", - "t69": "Встановити мережевий плагін Bambu", - "t70": "", - "t71": "Завантаження", - "t72": "Завантаження не вдалося", - "t73": "Встановлення виконано успішно.", - "t74": "Перезавантаження", - "t75": "Мережевий плагін Bambu надає наступні можливості:", - "t76": "Мережевий плагін Bambu не виявлено. Натисніть ", - "t77": "тут", - "t78": " щоб встановити його.", - "t79": "Помилка встановлення плагіна. ", - "t80": "Спробуйте виконати наступні дії:", - "t81": "1, Натисніть ", - "t82": " щоб відкрити папку плагінів", - "t83": "2, Закрийте всі відкриті Bambu Studio", - "t84": "3, Видаліть всі файли у папці плагіна", - "t85": "4, Відкрийте Bambu studio та знову встановіть підключуваний модуль.", - "t86": "Закрити", - "t87": "Інструкції", - "t88": "Видалити", - "t89": "Відкрити папку з вмістом", - "t90": "3D-модель", - "t91": "Завантажити 3D-моделі", - "t92": "Автор", - "t93": "Модифіковано", - "t94": "Поділитися", - "t95": "Інформація про модель", - "t96": "Прикріплені файли", - "t97": "Інформація про профіль", - "t98": "Ім'я моделі", - "t100": "Опис моделі", - "t101": "Список матеріалів", - "t102": "Пам'ятка зі збірки", - "t103": "Інше", - "t104": "Ім'я профілю", - "t105": "Профіль автора", - "t106": "Опис профілю", - "t107": "Моделі в мережі", - "t108": "Більше", - "t109": "Системні філаменти", - "t110":"Користувацькі філаменти", - "t111": "Створити новий", - "t112": "Приєднуйтеся до програми", - "t113": "Ви можете змінити свої переваги в будь-який час.", - "t114": "Головна сторінка", - "t115": "Одна партія", - "t116": "Спробувати знову" - }, "ru_RU": { "t1": "Приветствуем в Bambu Studio!", "t2": "Для настройка Bambu Studio необходимо пройти несколько этапов. Давайте начнём!", @@ -1444,117 +1334,7 @@ var LangText={ "t114":"Главная страница", "t115":"Одна партия", "t116":"Повторить попытку" - }, - "tr_TR": { - "t1": "Bambu Stüdyo'ya Hoş Geldiniz", - "t2": "Bambu Studio birkaç adımda kurulacaktır. Hadi başlayalım!", - "t3": "Kullanıcı Sözleşmesi", - "t4": "Reddet", - "t5": "Onayla", - "t6": "Herkesin baskısını iyileştirmek için yardımınızı rica ediyoruz.
Gelin ve Müşteri Deneyimi İyileştirme Programımıza Katılın", - "t7": "Anonim verilerin gönderilmesine izin ver", - "t8": "Geri", - "t9": "İleri", - "t10": "Yazıcı Seçimi", - "t11": "Hepsi", - "t12": "Hepsini temizle", - "t13": "mm nozul", - "t14": "Filament Seçimi", - "t15": "Yazıcı", - "t16": "Filament türü", - "t17": "Üretici", - "t18": "hata", - "t19": "En az bir filament seçilmelidir.", - "t20": "Varsayılan filamenti kullanmak ister misiniz ?", - "t21": "Evet", - "t22": "Hayır", - "t23": "Sürüm notu", - "t24": "Başla", - "t25": "Bitir", - "t26": "Giriş Yap", - "t27": "Kayıt Ol", - "t28": "Modeller", - "t29": "Mağaza", - "t30": "Kılavuz", - "t31": "Yeni proje", - "t32": "Yeni proje oluştur", - "t33": "Projeyi Aç", - "t34": "Erişim noktası", - "t35": "Yakın zamanda açıldı", - "t36": "Tamam", - "t37": "En az bir yazıcı seçilmelidir.", - "t38": "İptal Et", - "t39": "Onayla", - "t40": "Ağ bağlantısı kesildi, lütfen kontrol edin ve daha sonra tekrar deneyin.", - "t47": "Lütfen giriş bölgenizi seçin", - "t48": "Asya-Pasifik", - "t49": "Çin", - "t50": "Çıkış Yap", - "t52": "Atla", - "t53": "Katıl", - "t54": "3D Baskı topluluğunda, kendi dilimleme parametrelerimizi ve ayarlarımızı ayarlamak için birbirimizin başarılarından ve başarısızlıklarından öğreniyoruz. Bambu Studio da aynı prensibi izliyor ve kullanıcılarımız tarafından yapılan çok sayıda baskının başarı ve başarısızlıklarından performansını artırmak için makine öğrenimini kullanıyor. Bambu Studio'yu gerçek dünya verileriyle besleyerek daha akıllı olması için eğitiyoruz. İsterseniz, bu hizmet hata günlüklerinizden ve kullanım günlüklerinizden aşağıdaki bilgileri içerebilecek bilgilere erişecektir ", - "t55": "Privacy Policy", - "t56": ". Kişinin doğrudan veya dolaylı olarak tanımlanabileceği hiçbir Kişisel Veri toplamayacağız, bunlar arasında isimler, adresler, ödeme bilgileri veya telefon numaraları dahil olmamak üzere sınırlama olmaksızın bulunmaktadır. Bu hizmeti etkinleştirerek, bu şartları ve Gizlilik Politikası hakkındaki beyanı kabul etmiş olursunuz.", - "t57": "", - "t58": "", - "t59": ".", - "t60": "Avrupa", - "t61": "North America", - "t62": "Others", - "t63": "Bölgeyi değiştirdikten sonra hesabınızdan çıkış yapılacaktır. Lütfen daha sonra tekrar giriş yapın.", - "t64": "Bambu Ağı eklentisi", - "t65": "Yazdırma işi WLAN aracılığıyla gönderiliyor", - "t66": "Tam uzaktan kontrol", - "t67": "Canlı görüntü akışı", - "t68": "Kullanıcı veri senkronizasyonu", - "t69": "Bambu Ağı eklentisini yükleyin", - "t70": "", - "t71": "İndiriliyor", - "t72": "İndirme başarısız oldu", - "t73": "Kurulum başarılı oldu.", - "t74": "Tekrar başlat", - "t75": "Bambu Network eklentisi aşağıdaki özellikleri sağlar:", - "t76": "Bambu Network eklentisi algılanmadı. Tıklayın.", - "t77": "here", - "t78": " burayı tıklayın.", - "t79": "Eklenti yüklenemedi. ", - "t80": "Aşağıdaki adımları deneyin:", - "t81": "1, Eklenti ", - "t82": " eklenti dizinini açmak için tıklayın.", - "t83": "2, Tüm açık Bambu Studioyu kapatın ", - "t84": "3, Eklenti dizini altındaki tüm dosyaları silin", - "t85": "4, Bambu studioyu yeniden açın ve eklentiyi tekrar yükleyin", - "t86": "Kapat", - "t87": "Kullanım kılavuzu", - "t88": "Kaldır", - "t89": "Dosyayı içeren klasörü açınız", - "t90": "3D Model", - "t91": "3D modelleri İndirin", - "t92": "Tarafından oluşturulmuştur", - "t93": "Tarafından yeniden düzenlendi", - "t94": "Tarafından paylaşıldı", - "t95": "Model Bilgisi", - "t96": "Aksesuarlar", - "t97": "Profil Bilgisi", - "t98": "Model adı", - "t100":"Model açıklaması", - "t101":"Parça Listesi", - "t102":"Montaj Kılavuzu", - "t103":"Diğer", - "t104":"Profil adı", - "t105":"Profil Yazarı", - "t106":"Profil açıklaması", - "t107":"Çevrimiçi Modeller", - "t108":"DAHA FAZLA", - "t109":"Sistem Filamentleri", - "t110":"Özel Filamentler", - "t111":"Yeni Oluştur", - "t112":"Programa Katıl", - "t113":"ercihlerinizde istediğiniz zaman seçiminizi değiştirebilirsiniz.", - "t114":"Ana Sayfa", - "t115":"Toplu", - "t116":"Yeniden Dene" - } + } }; diff --git a/resources/web/homepage/css/dark.css b/resources/web/homepage/css/dark.css deleted file mode 100644 index 92e821c03..000000000 --- a/resources/web/homepage/css/dark.css +++ /dev/null @@ -1,131 +0,0 @@ -body -{ - background-color:#242428; -} - -* -{ - border-color: #3E3E45; -} - - -.TextS1 -{ - color:#efeff0; -} - -.TextS2 -{ - color:#B3B3B5; -} - -.ZScrol::-webkit-scrollbar-thumb {/*滚动条里面小方块*/ - background-color: #939594; -} - -.ZScrol::-webkit-scrollbar-track {/*滚动条里面轨道*/ - background: #161817; -} - - - - -/*----Left Menu Button----*/ -#LogoutBtn:hover -{ - background: #243E30; - color: #efeff0; -} - -.BtnItem -{ - color:#B3B3B5; -} - -.BtnItem:hover -{ - color: #efeff0; - background-color: #243E30; -} - -.BtnItem:hover .LeftIcon -{ - filter: brightness(300%); -} - -.BtnItemSelected -{ - color: #efeff0; - background-color: #243E30; -} - -.BtnItemSelected .LeftIcon -{ - filter: brightness(300%); -} - -/*-----Right Top MenuBtn-----*/ -.MenuItem:hover -{ - border-color: #4CAA50; - background-color: #243E30; -} - -#RecentClearAllBtn:hover -{ - color: #000; -} - -#recnet_context_menu -{ - color: #efeff0; - background-color:#242428; - border: 0px; - box-shadow: 0px 0px 3px #DCDCDC; -} - -/*----User Manual------*/ -.UG_DESC -{ - color:#818183; -} - -/*---Staff PIck----*/ -#HotModel_Swiper -{ - -} - -.HotModel_NameText -{ - height: 32px; -} - -.HotModelPiece -{ - border: 1px solid #4C4C55; - box-shadow: 0px 2px 12px rgba(0, 0, 0, 0.04); - background-color: #4C4C55; -} - -#HotModel_RIGHT_Title -{ - color: #818183; -} - -.swiper -{ - --swiper-navigation-color: #EFEFF0;/* 单独设置按钮颜色 */ -} - -.swiper-button-prev -{ - background: rgba(54, 54, 60, 0.88); - border: 1px solid rgba(129, 129, 131, 0.64); -} - -.swiper-button-next -{ - background: rgba(54, 54, 60, 0.88); - border: 1px solid rgba(129, 129, 131, 0.64); -} \ No newline at end of file diff --git a/resources/web/homepage/css/home.css b/resources/web/homepage/css/home.css deleted file mode 100644 index 4e2f7856c..000000000 --- a/resources/web/homepage/css/home.css +++ /dev/null @@ -1,774 +0,0 @@ -* -{ - padding:0px; - border: 0px; - margin: 0px; - font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans; - border-color: #D7D7D7; - user-select: none; -} - -html, body { - height: 100%; - width: 100%; - margin: 0px; - padding: 0px; - line-height: 20px; - font-size: 16px; -} - -.ZScrol::-webkit-scrollbar {/*滚动条整体样式*/ - width: 12px; /*高宽分别对应横竖滚动条的尺寸*/ - height: 1px; - padding: 2px; -} - -.ZScrol::-webkit-scrollbar-thumb {/*滚动条里面小方块*/ - border-radius: 6px; - -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2); - box-shadow: inset 0 0 5px rgba(0,0,0,0.2); - background-color: #AAAAAA; -} - -.ZScrol::-webkit-scrollbar-track {/*滚动条里面轨道*/ - -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2); - box-shadow: inset 0 0 5px rgba(0,0,0,0.2); - border-radius: 10px; - background: #EDEDED; -} - - -.RedFont -{ - font-size:12px; - color: #F07E4A; -} - -.LinkBtn -{ - font-size:12px; - color: #1200FF; - cursor: pointer; -} - -.LinkBtn:hover -{ - text-decoration:underline; -} - -/*------------------*/ -#DebugText -{ - height:30px; -} - -/*------------------*/ -body -{ - display:flex; - justify-content: flex-start; -} - -#LeftBoard -{ - border-right-width: 1px; - border-right-style: solid; - width:262px; - height: 100%; -} - -#LoginArea -{ - height: 180px; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - flex-wrap: nowrap; - position: relative; - width:262px; -} - - -#Login1 -{ - height:36px; - line-height: 36px; - display: flex; - justify-content: center; - user-select: none; -} - -#LoginBtn -{ - cursor:pointer; -} - -#LoginBtn:hover -{ - font-size:17px; -} - - -#NoPluginTip -{ - position: absolute; - top: 0px; - left: 0px; - bottom: 0px; - right: 0px; - z-index: 1; - display: none; - flex-direction: column; - justify-content: flex-end; - padding: 5px; -} - - -#DownloadBtn -{ - color:#0A00FF; -} - - -#Icon1 -{ - margin-right: 10px; -} - -#BBLIcon -{ - height:36px; -} - -#Login2 -{ - display: none; - flex-direction: column; - align-items: center; - text-align: center; - width: 262px; -} - -#UserAvatarIcon -{ - height: 85px; -} - -#UserName -{ - white-space: nowrap; - text-overflow: ellipsis; - text-align: center; - overflow: hidden; - width: 80%; -} - -#LogoutBtn -{ - font-size: 14px; - height: 24px; - line-height: 24px; - color: #00B731; - border: 1px solid #00AE42; - border-radius: 4px; - cursor: pointer; - margin-top: 5px; - padding: 0px 8px; -} - -#LogoutBtn:hover -{ - background: #00B731; - color: #fff; -} - - -/*------------------*/ -#BtnArea -{ - -} - - -.BtnItem -{ - padding-left:40px; - height:50px; - line-height: 50px; - display: flex; - justify-content:flex-start; - cursor: pointer; -} - -.BtnItem:hover -{ - background-color: #E0FCEB; -} - -.BtnItemSelected -{ - background-color: #E0FCEB; -} - -.BtnIcon -{ - margin-right:6px; - display: flex; - flex-direction: column; - justify-content: center; -} - -.LeftIcon -{ - width:20px; - height: 20px; -} - - -/*--------------------*/ -#RightBoard -{ - width: 100%; - height: 100%; - min-width: 835px; - overflow-y:auto; -} - -#ContentBoard -{ - overflow-y:auto; - padding: 0px 40px; - display: flex; - flex-direction: column; - position: relative; - height: 100%; -} - -.TitleSmallIcon -{ - width:30px; - height: 30px; - margin-right: 10px; -} - -#MenuArea -{ - height: 140px; - display: flex; - align-items: center; - flex: 0 0 140px; -} - -.MenuItem -{ - border-width: 1px; - border-style: solid; - border-radius: 12px; - height: 101px; - width: 253px; - padding-left: 20px; - display: flex; - justify-content: flex-start; - align-items: center; - margin-right: 16px; - cursor: pointer; -} - -.MenuItem:hover -{ - border-color: #4CAA50; - background-color: #E0FCEB; -} - -.MenuIcon -{ - margin-right: 1em; -} - -.MenuIcon img -{ - width:56px; - height: 56px; -} - -.MenuDesc -{ - color: #A8A8A8; -} - - -.Content-Title -{ - line-height: 30px; - font-weight: 700; -} - -#HotspotWEB -{ - width:100%; - height: 420px; -} - -#HotModelBlock -{ - display:flex; - align-items: center; - justify-content: space-between; - padding: 0px; -} - -#HotModel_LEFT_Title -{ - display:flex; - align-items: center; - padding: 6px 0px; -} - -#HotModel_RIGHT_Title -{ - font-size:16px; -} - - -.HotModel_PrevImg -{ - width: 200px; - height: 148px; - object-fit: cover; -} - - -#RecentFileArea -{ - margin-top: 10px; - flex: 1; - display: flex; - flex-direction: column; -} - -#RecentTitleBlock -{ - display:flex; - align-items: center; - padding: 6px 0px; -} - -#RecentClearAllBtn -{ - border-width: 1px; - border-style: solid; - padding: 0px 10px; - border-radius: 6px; - line-height: 26px; - height: 26px; - margin-left: 20px; - cursor: pointer; - display: none; -} - -#RecentClearAllBtn:hover -{ - background-color:#CDCECE; -} - -#RecentTitle -{ - -} - -#FileList -{ - flex: 1; - display: flex; - flex-wrap: wrap; - align-content: flex-start; - overflow-y: auto; -} - -.FileItem -{ - width: 184px; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - word-break: break-all; - position: relative; - cursor: pointer; - margin: 8px; -} - -.FileTip -{ - position: absolute; - top: 0px; - left: 0px; - right: 0px; - bottom: 0px; -} - -.FileImg -{ - text-align: center; - background-color: #E4E4E4; - border-radius: 8px; - width: 184px; - height: 184px; -} - -.FileItem img -{ - width: 184px; - height: 184px; - border-radius: 8px; - display: inline-block; - object-fit: cover; -} - -.FileName -{ - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - word-break: break-all; -} - -.FileDate -{ - color: #A8A8A8; -} - -#recnet_context_menu -{ - position: absolute; - margin: 0px; - padding: 10px; - border: 0px; - min-width: 100px; - border: 1px solid #D7D7D7; - top: 100px; - border-radius: 5px; - color: #323A3D; - background-color: #fff; - display: none; - z-index: 1; -} - -.CT_Item -{ - padding: 4px 12px; - display: flex; - flex-direction: row; - align-items: center; -} - -.CT_Item:hover -{ - cursor: pointer; - background-color: #0078D4; - border-radius: 4px; - color: #fff; -} - - -.CT_Icon -{ - margin-right: 6px; - width: 16px; - height: 16px; -} - -#CT_Delete_Bar:hover .CT_Delete -{ - background: url("../img/remove2.svg"); - background-repeat: no-repeat; - background-size: contain; -} - -.CT_Delete -{ - background: url("../img/remove.svg"); - background-repeat: no-repeat; - background-size: contain; -} - -#CT_Folder_Bar:hover .CT_Explore -{ - background: url("../img/open_folder2.svg"); - background-repeat: no-repeat; - background-size: contain; -} - -.CT_Explore -{ - background: url("../img/open_folder.svg"); - background-repeat: no-repeat; - background-size: contain; -} - - -.CT_Seperate -{ - border-bottom:1px solid #C5C5C5; -} - -.CT_Text -{ - line-height: 20px; - height: 20px; - display: block; -} - -/*--------Mall------*/ -#MallBoard -{ - height: 100%; - max-width: 1600px; - overflow-y: hidden; - padding: 0px 40px; - display: none; -} - -#MallWeb -{ - width: 100%; - height: 95%; - border: 1px solid #D9D9D9; -} - -/*------Manual------*/ -#ManualBoard -{ - height: 100%; - max-width: 1600px; - overflow-y: hidden; - padding: 0px 40px; - display: none; -} - -#ManualWeb -{ - width: 100%; - height: 95%; - border: 1px solid #D9D9D9; -} - - -/*---------Wiki----------*/ -#WikiGuideBigBoard -{ - display:none; -} - - -#WikiGuideBoard -{ - display: flex; - flex-wrap: wrap; - align-content: flex-start; - overflow-y: auto; - margin: 30px 40px; - position: relative; - top: 0px; - bottom: 0px; - right: 0px; - left: 0px; -} - - -@media screen and (max-width: 1100px) { -.GuideBlock -{ - width: calc(50% - 20px); - margin: 0px 10px 40px 10px; - cursor: pointer; -} -} - -@media screen and ( min-width:1101px) and ( max-width:1680px ) -{ - .GuideBlock - { - width: calc(33% - 20px); - margin: 0px 10px 40px 10px; - cursor: pointer; - } -} - -@media screen and ( min-width:1681px) and (max-width:2120px ) { -.GuideBlock -{ - width: calc(25% - 20px); - margin: 0px 10px 40px 10px; - cursor: pointer; -} -} - -@media screen and ( min-width:2121px) and (max-width:2620px ) { -.GuideBlock -{ - width: calc(20% - 20px); - margin: 0px 10px 40px 10px; - cursor: pointer; -} -} - -@media screen and (min-width:2621px ) and (max-width:3120px ) { -.GuideBlock -{ - width: calc(16.6% - 20px); - margin: 0px 10px 40px 10px; - cursor: pointer; -} -} - -@media screen and (min-width:3121px ) { -.GuideBlock -{ - width: calc(14.2% - 20px); - margin: 0px 10px 40px 10px; - cursor: pointer; -} -} - - - - -.UG_IMG -{ - width: 100%; -} - -.UG_IMG img -{ - width: 100%; - border-radius: 5px 5px 0px 0px; -} - -.UG_TITLE -{ - font-size: 18px; - font-weight: 700; - line-height: 20px; - width: 100%; - margin-top: 20px; - margin-bottom: 4px; -} - -.UG_DESC -{ - width: 100%; - line-height: 18px; - color: #4E5454; - font-size: 14px; -} - -/*--Staff Pick--*/ -#HotModelArea -{ - display: none; -} - -#HotModel_Swiper -{ - padding: 0px; -} - -.HotModel_Designer_Info -{ - display:flex; - align-items: center; - height: 28px; - padding: 0px 8px; -} - -.HotModel_Designer_Info img -{ - width: 16px; - height: 16px; - border-radius: 8px; -} - -.HotModel_Designer_Info span -{ - margin-left: 6px; - font-size: 12px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -#HotModel_RIGHT_Title:hover -{ - cursor: pointer; - color:#00AE42; -} - -.HotModelPiece -{ - width: 200px!important; - display:flex; - flex-direction: column; - cursor: pointer; - border: 1px solid #EEEEEE; - box-shadow: 0px 2px 12px rgba(0, 0, 0, 0.04); - border-radius: 8px; -} - -.HotModel_PrevBlock -{ - height: 150px; -} - -.HotModel_PrevImg -{ - width: 200px; - height: 150px; -} - -.HotModel_NameText -{ - height: 32px; - line-height: 32px; - padding: 0px 8px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: 14px; -} - - -.swiper-scrollbar -{ - height: 10px!important; -} - -.swiper-button-prev -{ - width: 40px!important; - height: 40px!important; - border-radius: 20px!important; - background: rgba(244, 244, 244, 0.88); -} - -.swiper-button-next -{ - width: 40px!important; - height: 40px!important; - border-radius: 20px!important; - background: rgba(244, 244, 244, 0.88); -} - -.swiper -{ - --swiper-theme-color: #ff6600;/* 设置Swiper风格 */ - --swiper-navigation-color: #676767;/* 单独设置按钮颜色 */ - --swiper-navigation-size: 12px;/* 设置按钮大小 */ -} - -.swiper-button-disabled -{ - opacity: 1!important; - cursor: pointer!important; - pointer-events: auto!important; -} \ No newline at end of file diff --git a/resources/web/homepage/css/light.css b/resources/web/homepage/css/light.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/web/homepage/img/3d_text.png b/resources/web/homepage/img/3d_text.png deleted file mode 100644 index 0ab23144b..000000000 Binary files a/resources/web/homepage/img/3d_text.png and /dev/null differ diff --git a/resources/web/homepage/img/high_speed_print_at_quality.png b/resources/web/homepage/img/high_speed_print_at_quality.png deleted file mode 100644 index 900ee5d78..000000000 Binary files a/resources/web/homepage/img/high_speed_print_at_quality.png and /dev/null differ diff --git a/resources/web/homepage/img/multi_color_printing.png b/resources/web/homepage/img/multi_color_printing.png deleted file mode 100644 index ab2494c8c..000000000 Binary files a/resources/web/homepage/img/multi_color_printing.png and /dev/null differ diff --git a/resources/web/homepage/img/project_based_workflow.png b/resources/web/homepage/img/project_based_workflow.png deleted file mode 100644 index 3991564ae..000000000 Binary files a/resources/web/homepage/img/project_based_workflow.png and /dev/null differ diff --git a/resources/web/homepage/img/quick_start.png b/resources/web/homepage/img/quick_start.png deleted file mode 100644 index 56d60be3a..000000000 Binary files a/resources/web/homepage/img/quick_start.png and /dev/null differ diff --git a/resources/web/homepage/img/remote_control_and_monitoring.png b/resources/web/homepage/img/remote_control_and_monitoring.png deleted file mode 100644 index 3e225d522..000000000 Binary files a/resources/web/homepage/img/remote_control_and_monitoring.png and /dev/null differ diff --git a/resources/web/homepage/img/setting_guide_of_slicing_parameters.png b/resources/web/homepage/img/setting_guide_of_slicing_parameters.png deleted file mode 100644 index 4d7a1eb6f..000000000 Binary files a/resources/web/homepage/img/setting_guide_of_slicing_parameters.png and /dev/null differ diff --git a/resources/web/homepage/img/step.png b/resources/web/homepage/img/step.png deleted file mode 100644 index 73a9232d4..000000000 Binary files a/resources/web/homepage/img/step.png and /dev/null differ diff --git a/resources/web/homepage/img/t1.svg b/resources/web/homepage/img/t1.svg deleted file mode 100644 index 319067548..000000000 --- a/resources/web/homepage/img/t1.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/resources/web/homepage/index.html b/resources/web/homepage/index.html deleted file mode 100644 index c47e7b775..000000000 --- a/resources/web/homepage/index.html +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - -homepage - - - - - - - - - - - - - - -
-
-
-
-
login/register
-
- -
-
- -
-
-
log out
-
- - - -
- -
-
-
-
recent
-
-
-
-
UserGuide
-
-
-
- -
-
-
- - -
- -
-
-
- -
Online Models
-
-
MORE >
-
-
-
- -
-
-
- -
-
- - - -
-
- -
Recently opened
-
Clear all
-
-
- -
-
- -
- -
-
-
-
clear
-
-
-
-
open in explorer
-
-
- - -
- -
-
-
-
-
Quick Start
-
This article introduces the most basic usage of Bambu Studio. It guides users to configure software, create projects, and complete the first printing task step by step.
-
-
-
-
Project Based Workflow
-
Bambu Studio has put forward a leading workflow to truly achieve an “all in one” project. Based on the mainstream 3MF project format, it provides a series of revolutionary new features, such as Multi-Plate Support, a Project Resource Manager, and Assembly/Part View. It greatly improves the efficiency of both creators and regular users.
-
-
-
-
High Speed Print at Quality
-
It is challenging to print at high speed while maintaining high quality. Bambu Studio makes this happen. - "Arch Move" makes the toolhead move smoothly and reduces the machine's vibration. The smart cooling is based on fine-tuned cooling parameters for each filament type. - "Auto slow down" for overhang walls works to prevent deformation at high speeds.
-
-
-
-
Multi-Color Printing
-
Bambu Studio provides versatile colorizing tools to make a colorful model. You can freely add/remove filaments in a project and colorize your model with different brushes. Before printing, each filament will be auto-mapped to an AMS slot, not needing to manually change the spool placement in the AMS.
-
-
-
-
Setting Guide of Slicing Parameters
-
The parameter management features in Bambu Studio provide very flexible and powerful control over the slicing process. This article introduces the organization of parameters and provides some skills on taking full advantage of these capabilities.
-
-
-
-
Remote Control & Monitoring
-
Bambu Studio support sending print job to your printer over WAN/LAN network, controlling & monitoring every aspect of your 3D printer and printing jobs. If you have more than one printer, you can easily switch between them in the device list.
-
-
-
-
STEP Format
-
Compared with STL, STEP brings more effective information. Thanks to the high accuracy of STEP, a lot of extrusion paths can be generated as arcs. STEP also includes the assembly relationship of each part of a model, which can be used to restore the assembly view after a model is split.
-
-
-
-
3D Text
-
With 3D Text tool, users can easily create various 3D text shapes in the project, making the model more personalized. Bambu Studio provides dozens of fonts and supports bold and italic styles to give text greater flexibility.
-
-
-
- -
- - - - - - - - - - - - - - - - diff --git a/resources/web/homepage/js/home.js b/resources/web/homepage/js/home.js deleted file mode 100644 index 77aa7d58d..000000000 --- a/resources/web/homepage/js/home.js +++ /dev/null @@ -1,518 +0,0 @@ -//var TestData={"sequence_id":"0","command":"get_recent_projects","response":[{"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() -{ - //-----Official----- - TranslatePage(); - - SendMsg_GetLoginInfo(); - SendMsg_GetRecentFile(); - SendMsg_GetStaffPick(); -} - -//------最佳打开文件的右键菜单功能---------- -var RightBtnFilePath=''; - -var MousePosX=0; -var MousePosY=0; -var sImages = {}; - -function Set_RecentFile_MouseRightBtn_Event() -{ - $(".FileItem").mousedown( - function(e) - { - //FilePath - RightBtnFilePath=$(this).attr('fpath'); - - if(e.which == 3){ - //鼠标点击了右键+$(this).attr('ff') ); - ShowRecnetFileContextMenu(); - }else if(e.which == 2){ - //鼠标点击了中键 - }else if(e.which == 1){ - //鼠标点击了左键 - OnOpenRecentFile( encodeURI(RightBtnFilePath) ); - } - }); - - $(document).bind("contextmenu",function(e){ - //在这里书写代码，构建个性右键化菜单 - return false; - }); - - $(document).mousemove( function(e){ - MousePosX=e.pageX; - MousePosY=e.pageY; - - let ContextMenuWidth=$('#recnet_context_menu').width(); - let ContextMenuHeight=$('#recnet_context_menu').height(); - - let DocumentWidth=$(document).width(); - let DocumentHeight=$(document).height(); - - //$("#DebugText").text( ContextMenuWidth+' - '+ContextMenuHeight+'
'+ - // DocumentWidth+' - '+DocumentHeight+'
'+ - // MousePosX+' - '+MousePosY +'
' ); - } ); - - - $(document).click( function(){ - var e = e || window.event; -        var elem = e.target || e.srcElement; -        while (elem) { - if (elem.id && elem.id == 'recnet_context_menu') { -                    return; - } - elem = elem.parentNode; - } - - $("#recnet_context_menu").hide(); - } ); - - -} - - -function HandleStudio( pVal ) -{ - let strCmd = pVal['command']; - - if(strCmd=='get_recent_projects') - { - ShowRecentFileList(pVal['response']); - } - else if(strCmd=='studio_userlogin') - { - SetLoginInfo(pVal['data']['avatar'],pVal['data']['name']); - } - else if(strCmd=='studio_useroffline') - { - SetUserOffline(); - } - else if( strCmd=="studio_set_mallurl" ) - { - SetMallUrl( pVal['data']['url'] ); - } - else if( strCmd=="studio_clickmenu" ) - { - let strName=pVal['data']['menu']; - - GotoMenu(strName); - } - else if( strCmd=="network_plugin_installtip" ) - { - let nShow=pVal["show"]*1; - - if(nShow==1) - { - $("#NoPluginTip").show(); - $("#NoPluginTip").css("display","flex"); - } - else - { - $("#NoPluginTip").hide(); - } - } - else if( strCmd=="modelmall_model_advise_get") - { - //alert('hot'); - 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 ); - } -} - -function GotoMenu( strMenu ) -{ - let MenuList=$(".BtnItem"); - let nAll=MenuList.length; - - for(let n=0;n0?sPath.lastIndexOf('\\'):sPath.lastIndexOf('\/'); - //let sShortName=sPath.substring(index+1,sPath.length); - - let TmpHtml='
'+ - ''+ - '
No Image
'+ - '
'+sName+'
'+ - '
'+sTime+'
'+ - '
'; - - strHtml+=TmpHtml; - } - - $("#FileList").html(strHtml); - - Set_RecentFile_MouseRightBtn_Event(); - UpdateRecentClearBtnDisplay(); -} - -function ShowRecnetFileContextMenu() -{ - $("#recnet_context_menu").offset({top: 10000, left:-10000}); - $('#recnet_context_menu').show(); - - let ContextMenuWidth=$('#recnet_context_menu').width(); - let ContextMenuHeight=$('#recnet_context_menu').height(); - - let DocumentWidth=$(document).width(); - let DocumentHeight=$(document).height(); - - let RealX=MousePosX; - let RealY=MousePosY; - - if( MousePosX + ContextMenuWidth + 24 >DocumentWidth ) - RealX=DocumentWidth-ContextMenuWidth-24; - if( MousePosY+ContextMenuHeight+24>DocumentHeight ) - RealY=DocumentHeight-ContextMenuHeight-24; - - $("#recnet_context_menu").offset({top: RealY, left:RealX}); -} - -/*-------RecentFile MX Message------*/ -function SendMsg_GetLoginInfo() -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="get_login_info"; - - SendWXMessage( JSON.stringify(tSend) ); -} - - -function SendMsg_GetRecentFile() -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="get_recent_projects"; - - SendWXMessage( JSON.stringify(tSend) ); -} - - -function OnLoginOrRegister() -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="homepage_login_or_register"; - - SendWXMessage( JSON.stringify(tSend) ); -} - -function OnClickModelDepot() -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="homepage_modeldepot"; - - SendWXMessage( JSON.stringify(tSend) ); -} - -function OnClickNewProject() -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="homepage_newproject"; - - SendWXMessage( JSON.stringify(tSend) ); -} - -function OnClickOpenProject() -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="homepage_openproject"; - - SendWXMessage( JSON.stringify(tSend) ); -} - -function OnOpenRecentFile( strPath ) -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="homepage_open_recentfile"; - tSend['data']={}; - tSend['data']['path']=decodeURI(strPath); - - SendWXMessage( JSON.stringify(tSend) ); -} - -function OnDeleteRecentFile( ) -{ - //Clear in UI - $("#recnet_context_menu").hide(); - - let AllFile=$(".FileItem"); - let nFile=AllFile.length; - for(let p=0;p0 ) - $("#RecentClearAllBtn").show(); - else - $("#RecentClearAllBtn").hide(); -} - - - - -function OnExploreRecentFile( ) -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="homepage_explore_recentfile"; - tSend['data']={}; - tSend['data']['path']=decodeURI(RightBtnFilePath); - - SendWXMessage( JSON.stringify(tSend) ); - - $("#recnet_context_menu").hide(); -} - -function OnLogOut() -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="homepage_logout"; - - SendWXMessage( JSON.stringify(tSend) ); -} - -function BeginDownloadNetworkPlugin() -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="begin_network_plugin_download"; - - SendWXMessage( JSON.stringify(tSend) ); -} - -function OutputKey(keyCode, isCtrlDown, isShiftDown, isCmdDown) { - var tSend = {}; - tSend['sequence_id'] = Math.round(new Date() / 1000); - tSend['command'] = "get_web_shortcut"; - tSend['key_event'] = {}; - tSend['key_event']['key'] = keyCode; - tSend['key_event']['ctrl'] = isCtrlDown; - tSend['key_event']['shift'] = isShiftDown; - tSend['key_event']['cmd'] = isCmdDown; - - SendWXMessage(JSON.stringify(tSend)); -} - -//-------------User Manual------------ - -function OpenWikiUrl( strUrl ) -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="userguide_wiki_open"; - tSend['data']={}; - tSend['data']['url']=strUrl; - - SendWXMessage( JSON.stringify(tSend) ); -} - -//--------------Staff Pick------- -var StaffPickSwiper=null; -function InitStaffPick() -{ - if( StaffPickSwiper!=null ) - { - StaffPickSwiper.destroy(true,true); - StaffPickSwiper=null; - } - - StaffPickSwiper = new Swiper('#HotModel_Swiper.swiper', { - slidesPerView : 'auto', - spaceBetween: 16, - navigation: { - nextEl: '.swiper-button-next', - prevEl: '.swiper-button-prev', - }, - slidesPerView : 'auto', - slidesPerGroup : 3 -// autoplay: { -// delay: 3000, -// stopOnLastSlide: false, -// disableOnInteraction: true, -// disableOnInteraction: false -// }, -// pagination: { -// el: '.swiper-pagination', -// }, -// scrollbar: { -// el: '.swiper-scrollbar', -// draggable: true -// } - }); -} - -function SendMsg_GetStaffPick() -{ - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="modelmall_model_advise_get"; - - SendWXMessage( JSON.stringify(tSend) ); - - setTimeout("SendMsg_GetStaffPick()",3600*1000*6); -} - -function ShowStaffPick( ModelList ) -{ - let PickTotal=ModelList.length; - if(PickTotal==0) - { - $('#HotModelList').html(''); - $('#HotModelArea').hide(); - - return; - } - - let strPickHtml=''; - for(let a=0;a'+ - '
'+DesignerName+'
'+ - '
'+ - '
'+ModelName+'
'+ - ''; - } - - $('#HotModelList').html(strPickHtml); - InitStaffPick(); - $('#HotModelArea').show(); -} - -function OpenOneStaffPickModel( ModelID ) -{ - //alert(ModelID); - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="modelmall_model_open"; - tSend['data']={}; - tSend['data']['id']=ModelID; - - SendWXMessage( JSON.stringify(tSend) ); -} - - -//---------------Global----------------- -window.postMessage = HandleStudio; diff --git a/resources/web/homepage/test.html b/resources/web/homepage/test.html deleted file mode 100644 index dc515385f..000000000 --- a/resources/web/homepage/test.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - -homepage - - - - - - - -
-
-
- - - - - - - - - - - - - - - diff --git a/resources/web/homepage2/css/light.css b/resources/web/homepage2/css/light.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/web/homepage2/img/a.jpg b/resources/web/homepage2/img/a.jpg deleted file mode 100644 index 5fd010204..000000000 Binary files a/resources/web/homepage2/img/a.jpg and /dev/null differ diff --git a/resources/web/homepage2/img/b.jpg b/resources/web/homepage2/img/b.jpg deleted file mode 100644 index a8c8933bc..000000000 Binary files a/resources/web/homepage2/img/b.jpg and /dev/null differ diff --git a/resources/web/homepage2/img/c.jpg b/resources/web/homepage2/img/c.jpg deleted file mode 100644 index 50c5883ca..000000000 Binary files a/resources/web/homepage2/img/c.jpg and /dev/null differ diff --git a/resources/web/homepage2/img/d.png b/resources/web/homepage2/img/d.png deleted file mode 100644 index bddeb8cc4..000000000 Binary files a/resources/web/homepage2/img/d.png and /dev/null differ diff --git a/resources/web/homepage2/img/i1.png b/resources/web/homepage2/img/i1.png deleted file mode 100644 index 1903609b3..000000000 Binary files a/resources/web/homepage2/img/i1.png and /dev/null differ diff --git a/resources/web/homepage2/img/i2.png b/resources/web/homepage2/img/i2.png deleted file mode 100644 index 55a2e74fb..000000000 Binary files a/resources/web/homepage2/img/i2.png and /dev/null differ diff --git a/resources/web/homepage2/img/i3.png b/resources/web/homepage2/img/i3.png deleted file mode 100644 index dad76d16f..000000000 Binary files a/resources/web/homepage2/img/i3.png and /dev/null differ diff --git a/resources/web/homepage2/img/i4.png b/resources/web/homepage2/img/i4.png deleted file mode 100644 index 81aa876ce..000000000 Binary files a/resources/web/homepage2/img/i4.png and /dev/null differ diff --git a/resources/web/homepage2/img/i5.png b/resources/web/homepage2/img/i5.png deleted file mode 100644 index 1663e06a5..000000000 Binary files a/resources/web/homepage2/img/i5.png and /dev/null differ diff --git a/resources/web/homepage2/img/i6.png b/resources/web/homepage2/img/i6.png deleted file mode 100644 index 8d4cbaba0..000000000 Binary files a/resources/web/homepage2/img/i6.png and /dev/null differ diff --git a/resources/web/homepage2/img/open_folder.svg b/resources/web/homepage2/img/open_folder.svg deleted file mode 100644 index b4eb1197d..000000000 --- a/resources/web/homepage2/img/open_folder.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/web/homepage2/img/open_folder2.svg b/resources/web/homepage2/img/open_folder2.svg deleted file mode 100644 index c5c3a6c84..000000000 --- a/resources/web/homepage2/img/open_folder2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/web/homepage2/img/remove.svg b/resources/web/homepage2/img/remove.svg deleted file mode 100644 index 19d9eb241..000000000 --- a/resources/web/homepage2/img/remove.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/resources/web/homepage2/img/remove2.svg b/resources/web/homepage2/img/remove2.svg deleted file mode 100644 index 7c913c001..000000000 --- a/resources/web/homepage2/img/remove2.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/resources/web/homepage2/img/t2.svg b/resources/web/homepage2/img/t2.svg deleted file mode 100644 index a7864b126..000000000 --- a/resources/web/homepage2/img/t2.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/resources/web/homepage2/img/wiki.png b/resources/web/homepage2/img/wiki.png deleted file mode 100644 index c6a19f469..000000000 Binary files a/resources/web/homepage2/img/wiki.png and /dev/null differ diff --git a/resources/web/homepage2/img/wiki2.png b/resources/web/homepage2/img/wiki2.png deleted file mode 100644 index 7a867d41a..000000000 Binary files a/resources/web/homepage2/img/wiki2.png and /dev/null differ diff --git a/resources/web/homepage2/img/wiki3.png b/resources/web/homepage2/img/wiki3.png deleted file mode 100644 index f5a52c2e3..000000000 Binary files a/resources/web/homepage2/img/wiki3.png and /dev/null differ diff --git a/resources/web/homepage2/manual.html b/resources/web/homepage2/manual.html deleted file mode 100644 index d5466e308..000000000 --- a/resources/web/homepage2/manual.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - -homepage - - - - - - - - - - - - - - - -
-
-
-
Quick Start
-
This article introduces the most basic usage of Bambu Studio. It guides users to configure software, create projects, and complete the first printing task step by step.
-
-
-
-
Project Based Workflow
-
Bambu Studio has put forward a leading workflow to truly achieve an “all in one” project. Based on the mainstream 3MF project format, it provides a series of revolutionary new features, such as Multi-Plate Support, a Project Resource Manager, and Assembly/Part View. It greatly improves the efficiency of both creators and regular users.
-
-
-
-
High Speed Print at Quality
-
It is challenging to print at high speed while maintaining high quality. Bambu Studio makes this happen. - "Arch Move" makes the toolhead move smoothly and reduces the machine's vibration. The smart cooling is based on fine-tuned cooling parameters for each filament type. - "Auto slow down" for overhang walls works to prevent deformation at high speeds.
-
-
-
-
Multi-Color Printing
-
Bambu Studio provides versatile colorizing tools to make a colorful model. You can freely add/remove filaments in a project and colorize your model with different brushes. Before printing, each filament will be auto-mapped to an AMS slot, not needing to manually change the spool placement in the AMS.
-
-
-
-
Setting Guide of Slicing Parameters
-
The parameter management features in Bambu Studio provide very flexible and powerful control over the slicing process. This article introduces the organization of parameters and provides some skills on taking full advantage of these capabilities.
-
-
-
-
Remote Control & Monitoring
-
Bambu Studio support sending print job to your printer over WAN/LAN network, controlling & monitoring every aspect of your 3D printer and printing jobs. If you have more than one printer, you can easily switch between them in the device list.
-
-
-
-
STEP Format
-
Compared with STL, STEP brings more effective information. Thanks to the high accuracy of STEP, a lot of extrusion paths can be generated as arcs. STEP also includes the assembly relationship of each part of a model, which can be used to restore the assembly view after a model is split.
-
-
-
-
3D Text
-
With 3D Text tool, users can easily create various 3D text shapes in the project, making the model more personalized. Bambu Studio provides dozens of fonts and supports bold and italic styles to give text greater flexibility.
-
-
- - - - - - - - - - - - - - - - - diff --git a/resources/web/homepage2/online.html b/resources/web/homepage2/online.html deleted file mode 100644 index b94439e25..000000000 --- a/resources/web/homepage2/online.html +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - -homepage - - - - - - - - - - - - - - -
-
-
- -
Online Models
-
-
MORE >
-
-
-
- -
For You
-
-
MORE >
-
-
-
-
- -
-
-
- -
-
-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaaaaa
-
-
1.7m
-
2.8k
-
-
-
-
-
-
-
- -
-
-
- -
-
-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaaaaa
-
-
1.7m
-
2.8k
-
-
-
-
-
-
-
- -
-
-
- -
-
-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaaaaa
-
-
1.7m
-
2.8k
-
-
-
-
-
-
-
- -
-
-
- -
-
-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaaaaa
-
-
1.7m
-
2.8k
-
-
-
-
-
-
-
- -
-
-
- -
-
-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaaaaa
-
-
1.7m
-
2.8k
-
-
-
-
-
-
-
- -
-
-
- -
-
-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaaaaa
-
-
1.7m
-
2.8k
-
-
-
-
-
-
-
- -
-
-
- -
-
-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaaaaa
-
-
1.7m
-
2.8k
-
-
-
-
-
-
-
- -
-
-
- -
-
-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaaaaa
-
-
1.7m
-
2.8k
-
-
-
-
-
-
-
- -
-
-
- -
-
-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaaaaa
-
-
1.7m
-
2.8k
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - diff --git a/resources/web/homepage2/recent.html b/resources/web/homepage2/recent.html deleted file mode 100644 index 63e9f505f..000000000 --- a/resources/web/homepage2/recent.html +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - -homepage - - - - - - - - - - - - - - - - - - -
-
-
- -
Recently opened
-
-
- - - - -
-
-
- -
-
- -
-
-
-
clear
-
-
-
-
open in explorer
-
-
- - - - - - - - - - - - - - - - diff --git a/resources/web/homepage2/test.html b/resources/web/homepage2/test.html deleted file mode 100644 index dc515385f..000000000 --- a/resources/web/homepage2/test.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - -homepage - - - - - - - -
-
-
- - - - - - - - - - - - - - - diff --git a/resources/web/homepage2/css/common.css b/resources/web/homepage3/css/common.css similarity index 100% rename from resources/web/homepage2/css/common.css rename to resources/web/homepage3/css/common.css diff --git a/resources/web/homepage2/css/dark.css b/resources/web/homepage3/css/dark.css similarity index 100% rename from resources/web/homepage2/css/dark.css rename to resources/web/homepage3/css/dark.css diff --git a/resources/web/homepage2/css/disconnect.css b/resources/web/homepage3/css/disconnect.css similarity index 100% rename from resources/web/homepage2/css/disconnect.css rename to resources/web/homepage3/css/disconnect.css diff --git a/resources/web/homepage2/css/home.css b/resources/web/homepage3/css/home.css similarity index 100% rename from resources/web/homepage2/css/home.css rename to resources/web/homepage3/css/home.css diff --git a/resources/web/homepage2/css/left.css b/resources/web/homepage3/css/left.css similarity index 100% rename from resources/web/homepage2/css/left.css rename to resources/web/homepage3/css/left.css diff --git a/resources/web/homepage2/css/manual.css b/resources/web/homepage3/css/manual.css similarity index 97% rename from resources/web/homepage2/css/manual.css rename to resources/web/homepage3/css/manual.css index 2c41fb7cc..37eaa8970 100644 --- a/resources/web/homepage2/css/manual.css +++ b/resources/web/homepage3/css/manual.css @@ -2,7 +2,7 @@ #WikiGuideBoard { - display: flex; + display: none; flex-wrap: wrap; align-content: flex-start; overflow-y: auto; diff --git a/resources/web/homepage2/css/online.css b/resources/web/homepage3/css/online.css similarity index 100% rename from resources/web/homepage2/css/online.css rename to resources/web/homepage3/css/online.css diff --git a/resources/web/homepage2/css/recent.css b/resources/web/homepage3/css/recent.css similarity index 96% rename from resources/web/homepage2/css/recent.css rename to resources/web/homepage3/css/recent.css index 75d82508e..f32deabc7 100644 --- a/resources/web/homepage2/css/recent.css +++ b/resources/web/homepage3/css/recent.css @@ -1,9 +1,8 @@ -#RecentFileArea +#RecentFileArea,#MiniRecentFileArea { flex: 1; - display: flex; flex-direction: column; position: relative; top: 0px; @@ -13,6 +12,16 @@ min-height: 100px; } +#MiniRecentFileArea +{ + display:flex; +} + +#RecentFileArea +{ + display: none; +} + #RecentTitleBlock { display:flex; @@ -76,7 +85,7 @@ display:none; } -#FileList +#FileList,#MiniFileList { flex: 1; display: flex; diff --git a/resources/web/homepage2/css/rightcommon.css b/resources/web/homepage3/css/rightcommon.css similarity index 100% rename from resources/web/homepage2/css/rightcommon.css rename to resources/web/homepage3/css/rightcommon.css diff --git a/resources/web/homepage2/disconnect.html b/resources/web/homepage3/disconnect.html similarity index 100% rename from resources/web/homepage2/disconnect.html rename to resources/web/homepage3/disconnect.html diff --git a/resources/web/homepage2/home.html b/resources/web/homepage3/home.html similarity index 56% rename from resources/web/homepage2/home.html rename to resources/web/homepage3/home.html index 60573e591..485229280 100644 --- a/resources/web/homepage2/home.html +++ b/resources/web/homepage3/home.html @@ -9,6 +9,7 @@ + @@ -33,8 +34,11 @@ + +
+ -
+
@@ -42,7 +46,7 @@
MORE >
-
+
@@ -314,6 +307,190 @@
+
+ + +
+
+
+
clear
+
+
+
+
open in explorer
+
+
+ + + +
+
+
+ +
Recently opened
+
+
+ + + + +
+
+
+ +
+
+ + + +
+
+
+
Quick Start
+
This article introduces the most basic usage of Bambu Studio. It guides users to configure software, create projects, and complete the first printing task step by step.
+
+
+
+
Project Based Workflow
+
Bambu Studio has put forward a leading workflow to truly achieve an “all in one” project. Based on the mainstream 3MF project format, it provides a series of revolutionary new features, such as Multi-Plate Support, a Project Resource Manager, and Assembly/Part View. It greatly improves the efficiency of both creators and regular users.
+
+
+
+
High Speed Print at Quality
+
It is challenging to print at high speed while maintaining high quality. Bambu Studio makes this happen. + "Arch Move" makes the toolhead move smoothly and reduces the machine's vibration. The smart cooling is based on fine-tuned cooling parameters for each filament type. + "Auto slow down" for overhang walls works to prevent deformation at high speeds.
+
+
+
+
Multi-Color Printing
+
Bambu Studio provides versatile colorizing tools to make a colorful model. You can freely add/remove filaments in a project and colorize your model with different brushes. Before printing, each filament will be auto-mapped to an AMS slot, not needing to manually change the spool placement in the AMS.
+
+
+
+
Setting Guide of Slicing Parameters
+
The parameter management features in Bambu Studio provide very flexible and powerful control over the slicing process. This article introduces the organization of parameters and provides some skills on taking full advantage of these capabilities.
+
+
+
+
Remote Control & Monitoring
+
Bambu Studio support sending print job to your printer over WAN/LAN network, controlling & monitoring every aspect of your 3D printer and printing jobs. If you have more than one printer, you can easily switch between them in the device list.
+
+
+
+
STEP Format
+
Compared with STL, STEP brings more effective information. Thanks to the high accuracy of STEP, a lot of extrusion paths can be generated as arcs. STEP also includes the assembly relationship of each part of a model, which can be used to restore the assembly view after a model is split.
+
+
+
+
3D Text
+
With 3D Text tool, users can easily create various 3D text shapes in the project, making the model more personalized. Bambu Studio provides dozens of fonts and supports bold and italic styles to give text greater flexibility.
+
+
+ diff --git a/resources/web/homepage2/img/3d_text.png b/resources/web/homepage3/img/3d_text.png similarity index 100% rename from resources/web/homepage2/img/3d_text.png rename to resources/web/homepage3/img/3d_text.png diff --git a/resources/web/homepage/img/a.jpg b/resources/web/homepage3/img/a.jpg similarity index 100% rename from resources/web/homepage/img/a.jpg rename to resources/web/homepage3/img/a.jpg diff --git a/resources/web/homepage/img/b.jpg b/resources/web/homepage3/img/b.jpg similarity index 100% rename from resources/web/homepage/img/b.jpg rename to resources/web/homepage3/img/b.jpg diff --git a/resources/web/homepage2/img/batch.svg b/resources/web/homepage3/img/batch.svg similarity index 100% rename from resources/web/homepage2/img/batch.svg rename to resources/web/homepage3/img/batch.svg diff --git a/resources/web/homepage/img/c.jpg b/resources/web/homepage3/img/c.jpg similarity index 100% rename from resources/web/homepage/img/c.jpg rename to resources/web/homepage3/img/c.jpg diff --git a/resources/web/homepage2/img/cancel.svg b/resources/web/homepage3/img/cancel.svg similarity index 100% rename from resources/web/homepage2/img/cancel.svg rename to resources/web/homepage3/img/cancel.svg diff --git a/resources/web/homepage2/img/checkbox.svg b/resources/web/homepage3/img/checkbox.svg similarity index 100% rename from resources/web/homepage2/img/checkbox.svg rename to resources/web/homepage3/img/checkbox.svg diff --git a/resources/web/homepage2/img/checkbox_hover.svg b/resources/web/homepage3/img/checkbox_hover.svg similarity index 100% rename from resources/web/homepage2/img/checkbox_hover.svg rename to resources/web/homepage3/img/checkbox_hover.svg diff --git a/resources/web/homepage2/img/clear.svg b/resources/web/homepage3/img/clear.svg similarity index 100% rename from resources/web/homepage2/img/clear.svg rename to resources/web/homepage3/img/clear.svg diff --git a/resources/web/homepage/img/d.png b/resources/web/homepage3/img/d.png similarity index 100% rename from resources/web/homepage/img/d.png rename to resources/web/homepage3/img/d.png diff --git a/resources/web/homepage2/img/delete.svg b/resources/web/homepage3/img/delete.svg similarity index 100% rename from resources/web/homepage2/img/delete.svg rename to resources/web/homepage3/img/delete.svg diff --git a/resources/web/homepage2/img/delete2.svg b/resources/web/homepage3/img/delete2.svg similarity index 100% rename from resources/web/homepage2/img/delete2.svg rename to resources/web/homepage3/img/delete2.svg diff --git a/resources/web/homepage2/img/disconnect.svg b/resources/web/homepage3/img/disconnect.svg similarity index 100% rename from resources/web/homepage2/img/disconnect.svg rename to resources/web/homepage3/img/disconnect.svg diff --git a/resources/web/homepage2/img/fire.svg b/resources/web/homepage3/img/fire.svg similarity index 100% rename from resources/web/homepage2/img/fire.svg rename to resources/web/homepage3/img/fire.svg diff --git a/resources/web/homepage2/img/foru.svg b/resources/web/homepage3/img/foru.svg similarity index 100% rename from resources/web/homepage2/img/foru.svg rename to resources/web/homepage3/img/foru.svg diff --git a/resources/web/homepage2/img/high_speed_print_at_quality.png b/resources/web/homepage3/img/high_speed_print_at_quality.png similarity index 100% rename from resources/web/homepage2/img/high_speed_print_at_quality.png rename to resources/web/homepage3/img/high_speed_print_at_quality.png diff --git a/resources/web/homepage/img/i1.png b/resources/web/homepage3/img/i1.png similarity index 100% rename from resources/web/homepage/img/i1.png rename to resources/web/homepage3/img/i1.png diff --git a/resources/web/homepage/img/i2.png b/resources/web/homepage3/img/i2.png similarity index 100% rename from resources/web/homepage/img/i2.png rename to resources/web/homepage3/img/i2.png diff --git a/resources/web/homepage/img/i3.png b/resources/web/homepage3/img/i3.png similarity index 100% rename from resources/web/homepage/img/i3.png rename to resources/web/homepage3/img/i3.png diff --git a/resources/web/homepage/img/i4.png b/resources/web/homepage3/img/i4.png similarity index 100% rename from resources/web/homepage/img/i4.png rename to resources/web/homepage3/img/i4.png diff --git a/resources/web/homepage/img/i5.png b/resources/web/homepage3/img/i5.png similarity index 100% rename from resources/web/homepage/img/i5.png rename to resources/web/homepage3/img/i5.png diff --git a/resources/web/homepage/img/i6.png b/resources/web/homepage3/img/i6.png similarity index 100% rename from resources/web/homepage/img/i6.png rename to resources/web/homepage3/img/i6.png diff --git a/resources/web/homepage2/img/jump.svg b/resources/web/homepage3/img/jump.svg similarity index 100% rename from resources/web/homepage2/img/jump.svg rename to resources/web/homepage3/img/jump.svg diff --git a/resources/web/homepage2/img/left_home.svg b/resources/web/homepage3/img/left_home.svg similarity index 100% rename from resources/web/homepage2/img/left_home.svg rename to resources/web/homepage3/img/left_home.svg diff --git a/resources/web/homepage2/img/left_manual.svg b/resources/web/homepage3/img/left_manual.svg similarity index 100% rename from resources/web/homepage2/img/left_manual.svg rename to resources/web/homepage3/img/left_manual.svg diff --git a/resources/web/homepage2/img/left_ml.svg b/resources/web/homepage3/img/left_ml.svg similarity index 100% rename from resources/web/homepage2/img/left_ml.svg rename to resources/web/homepage3/img/left_ml.svg diff --git a/resources/web/homepage2/img/left_online.svg b/resources/web/homepage3/img/left_online.svg similarity index 100% rename from resources/web/homepage2/img/left_online.svg rename to resources/web/homepage3/img/left_online.svg diff --git a/resources/web/homepage2/img/left_recent.svg b/resources/web/homepage3/img/left_recent.svg similarity index 100% rename from resources/web/homepage2/img/left_recent.svg rename to resources/web/homepage3/img/left_recent.svg diff --git a/resources/web/homepage2/img/ml.svg b/resources/web/homepage3/img/ml.svg similarity index 100% rename from resources/web/homepage2/img/ml.svg rename to resources/web/homepage3/img/ml.svg diff --git a/resources/web/homepage2/img/ml1.jpg b/resources/web/homepage3/img/ml1.jpg similarity index 100% rename from resources/web/homepage2/img/ml1.jpg rename to resources/web/homepage3/img/ml1.jpg diff --git a/resources/web/homepage2/img/ml2.jpg b/resources/web/homepage3/img/ml2.jpg similarity index 100% rename from resources/web/homepage2/img/ml2.jpg rename to resources/web/homepage3/img/ml2.jpg diff --git a/resources/web/homepage2/img/ml3.jpg b/resources/web/homepage3/img/ml3.jpg similarity index 100% rename from resources/web/homepage2/img/ml3.jpg rename to resources/web/homepage3/img/ml3.jpg diff --git a/resources/web/homepage2/img/multi_color_printing.png b/resources/web/homepage3/img/multi_color_printing.png similarity index 100% rename from resources/web/homepage2/img/multi_color_printing.png rename to resources/web/homepage3/img/multi_color_printing.png diff --git a/resources/web/homepage2/img/online.svg b/resources/web/homepage3/img/online.svg similarity index 100% rename from resources/web/homepage2/img/online.svg rename to resources/web/homepage3/img/online.svg diff --git a/resources/web/homepage/img/open_folder.svg b/resources/web/homepage3/img/open_folder.svg similarity index 100% rename from resources/web/homepage/img/open_folder.svg rename to resources/web/homepage3/img/open_folder.svg diff --git a/resources/web/homepage/img/open_folder2.svg b/resources/web/homepage3/img/open_folder2.svg similarity index 100% rename from resources/web/homepage/img/open_folder2.svg rename to resources/web/homepage3/img/open_folder2.svg diff --git a/resources/web/homepage2/img/project_based_workflow.png b/resources/web/homepage3/img/project_based_workflow.png similarity index 100% rename from resources/web/homepage2/img/project_based_workflow.png rename to resources/web/homepage3/img/project_based_workflow.png diff --git a/resources/web/homepage2/img/project_new.svg b/resources/web/homepage3/img/project_new.svg similarity index 100% rename from resources/web/homepage2/img/project_new.svg rename to resources/web/homepage3/img/project_new.svg diff --git a/resources/web/homepage2/img/project_open.svg b/resources/web/homepage3/img/project_open.svg similarity index 100% rename from resources/web/homepage2/img/project_open.svg rename to resources/web/homepage3/img/project_open.svg diff --git a/resources/web/homepage2/img/quick_start.png b/resources/web/homepage3/img/quick_start.png similarity index 100% rename from resources/web/homepage2/img/quick_start.png rename to resources/web/homepage3/img/quick_start.png diff --git a/resources/web/homepage2/img/remote_control_and_monitoring.png b/resources/web/homepage3/img/remote_control_and_monitoring.png similarity index 100% rename from resources/web/homepage2/img/remote_control_and_monitoring.png rename to resources/web/homepage3/img/remote_control_and_monitoring.png diff --git a/resources/web/homepage/img/remove.svg b/resources/web/homepage3/img/remove.svg similarity index 100% rename from resources/web/homepage/img/remove.svg rename to resources/web/homepage3/img/remove.svg diff --git a/resources/web/homepage/img/remove2.svg b/resources/web/homepage3/img/remove2.svg similarity index 100% rename from resources/web/homepage/img/remove2.svg rename to resources/web/homepage3/img/remove2.svg diff --git a/resources/web/homepage2/img/setting_guide_of_slicing_parameters.png b/resources/web/homepage3/img/setting_guide_of_slicing_parameters.png similarity index 100% rename from resources/web/homepage2/img/setting_guide_of_slicing_parameters.png rename to resources/web/homepage3/img/setting_guide_of_slicing_parameters.png diff --git a/resources/web/homepage2/img/step.png b/resources/web/homepage3/img/step.png similarity index 100% rename from resources/web/homepage2/img/step.png rename to resources/web/homepage3/img/step.png diff --git a/resources/web/homepage/img/t2.svg b/resources/web/homepage3/img/t2.svg similarity index 100% rename from resources/web/homepage/img/t2.svg rename to resources/web/homepage3/img/t2.svg diff --git a/resources/web/homepage/img/wiki.png b/resources/web/homepage3/img/wiki.png similarity index 100% rename from resources/web/homepage/img/wiki.png rename to resources/web/homepage3/img/wiki.png diff --git a/resources/web/homepage/img/wiki2.png b/resources/web/homepage3/img/wiki2.png similarity index 100% rename from resources/web/homepage/img/wiki2.png rename to resources/web/homepage3/img/wiki2.png diff --git a/resources/web/homepage/img/wiki3.png b/resources/web/homepage3/img/wiki3.png similarity index 100% rename from resources/web/homepage/img/wiki3.png rename to resources/web/homepage3/img/wiki3.png diff --git a/resources/web/homepage2/img/xia.svg b/resources/web/homepage3/img/xia.svg similarity index 100% rename from resources/web/homepage2/img/xia.svg rename to resources/web/homepage3/img/xia.svg diff --git a/resources/web/homepage2/img/zan.svg b/resources/web/homepage3/img/zan.svg similarity index 100% rename from resources/web/homepage2/img/zan.svg rename to resources/web/homepage3/img/zan.svg diff --git a/resources/web/homepage2/js/home.js b/resources/web/homepage3/js/home.js similarity index 88% rename from resources/web/homepage2/js/home.js rename to resources/web/homepage3/js/home.js index 8ca7ae109..f0a532691 100644 --- a/resources/web/homepage2/js/home.js +++ b/resources/web/homepage3/js/home.js @@ -2,6 +2,10 @@ var m_HotModelList=null; var m_ForUModelList=null; +var timer_CheckNetwork_HotModel=null; + +var m_MakerlabList=null; +var timer_CheckNetwork_Makerlab=null; function OnHomeInit() { @@ -135,6 +139,12 @@ function HandleStudio( pVal ) else if( strCmd=="modelmall_model_advise_get") { //alert('hot'); + if( timer_CheckNetwork_HotModel!=null ) + { + clearInterval(timer_CheckNetwork_HotModel); + timer_CheckNetwork_HotModel=null; + } + if( m_HotModelList!=null && pVal['hits'].length>0 ) { let SS1=JSON.stringify(pVal['hits']); @@ -150,6 +160,12 @@ function HandleStudio( pVal ) else if( strCmd=="modelmall_model_customized_get") { //alert('For U'); + if( timer_CheckNetwork_HotModel!=null ) + { + clearInterval(timer_CheckNetwork_HotModel); + timer_CheckNetwork_HotModel=null; + } + if( m_ForUModelList!=null && pVal['hits'].length>0 ) { let SS1=JSON.stringify(pVal['hits']); @@ -163,9 +179,69 @@ function HandleStudio( pVal ) Show4UPick( m_ForUModelList ); } else if(strCmd=='homepage_makerlab_get') - { - ShowMakerlabList(pVal['list']); + { + if( timer_CheckNetwork_Makerlab!=null ) + { + clearInterval(timer_CheckNetwork_Makerlab); + timer_CheckNetwork_Makerlab=null; + } + + if( m_MakerlabList!=null && pVal['list'].length>0 ) + { + let SS1=JSON.stringify(pVal['list']); + let SS2=JSON.stringify(m_MakerlabList); + + if( SS1==SS2 ) + return; + } + + m_MakerlabList=pVal['list']; + + ShowMakerlabList(m_MakerlabList); } + else if(strCmd=='homepage_leftmenu_clicked') + { + let strName=pVal['menu']; + OnBoardChange(strName); + } + else if(strCmd=='homepage_rightarea_reset') + { + $('#HotModelList').html(''); + $('#HotModelArea').hide(); + m_HotModelList=null; + m_ForUModelList=null; + + $('#LabList').html(''); + $('#MakerlabArea').hide(); + m_MakerlabList=null; + + OnHomeInit(); + } +} + +function OnBoardChange( strMenu ) +{ + if( strMenu=='home' ) + { + $('#MenuArea').css('display','flex'); + $('#HomeFullArea').css('display','inline'); + $('#RecentFileArea').css('display','none'); + $('#WikiGuideBoard').css('display','none'); + } + else if(strMenu=='recent') + { + $('#MenuArea').css('display','flex'); + $('#HomeFullArea').css('display','none'); + $('#RecentFileArea').css('display','flex'); + $('#WikiGuideBoard').css('display','none'); + } + else if(strMenu=='manual') + { + $('#MenuArea').css('display','none'); + $('#HomeFullArea').css('display','none'); + $('#RecentFileArea').css('display','none'); + $('#WikiGuideBoard').css('display','flex'); + } } function SwtichLeftMenu( strMenu ) @@ -215,7 +291,8 @@ function ShowRecentFileList( pList ) strHtml+=TmpHtml; } - $("#FileList").html(strHtml); + $("#FileList").html(strHtml); + $("#MiniFileList").html(strHtml); Set_RecentFile_MouseRightBtn_Event(); UpdateRecentClearBtnDisplay(); @@ -348,7 +425,7 @@ function OnDeleteAllRecentFiles() function UpdateRecentClearBtnDisplay() { - let AllFile=$(".FileItem"); + let AllFile=$("#RecentFileArea .FileItem"); let nFile=AllFile.length; if( nFile>0 ) { @@ -384,19 +461,6 @@ function BeginDownloadNetworkPlugin() SendWXMessage( JSON.stringify(tSend) ); } -function OutputKey(keyCode, isCtrlDown, isShiftDown, isCmdDown) { - var tSend = {}; - tSend['sequence_id'] = Math.round(new Date() / 1000); - tSend['command'] = "get_web_shortcut"; - tSend['key_event'] = {}; - tSend['key_event']['key'] = keyCode; - tSend['key_event']['ctrl'] = isCtrlDown; - tSend['key_event']['shift'] = isShiftDown; - tSend['key_event']['cmd'] = isCmdDown; - - SendWXMessage(JSON.stringify(tSend)); -} - function SendMsg_GetMakerlabList() { var tSend={}; @@ -404,6 +468,10 @@ function SendMsg_GetMakerlabList() tSend['command']="homepage_makerlab_get"; SendWXMessage( JSON.stringify(tSend) ); + + setTimeout("SendMsg_GetMakerlabList()",3600*1000*6); + if(timer_CheckNetwork_Makerlab==null) + timer_CheckNetwork_Makerlab=setInterval("SendMsg_GetMakerlabList()",60*1000); } function SwitchContent(strMenu) @@ -532,7 +600,9 @@ function SendMsg_GetStaffPick() SendWXMessage( JSON.stringify(tSend) ); - setTimeout("SendMsg_GetStaffPick()",3600*1000*6); + setTimeout("SendMsg_GetStaffPick()",3600*1000*6); + if(timer_CheckNetwork_HotModel==null) + timer_CheckNetwork_HotModel=setInterval("SendMsg_GetStaffPick()",60*1000); } function ExNumber( number ) diff --git a/resources/web/homepage2/js/left.js b/resources/web/homepage3/js/left.js similarity index 99% rename from resources/web/homepage2/js/left.js rename to resources/web/homepage3/js/left.js index 73eff5510..72dd48f8a 100644 --- a/resources/web/homepage2/js/left.js +++ b/resources/web/homepage3/js/left.js @@ -8,7 +8,7 @@ function OnInit() TranslatePage(); SendMsg_GetLoginInfo(); - GotoMenu( 'home' ); + GotoMenu( 'home' ); } function HandleStudio( pVal ) diff --git a/resources/web/homepage2/js/test.js b/resources/web/homepage3/js/test.js similarity index 100% rename from resources/web/homepage2/js/test.js rename to resources/web/homepage3/js/test.js diff --git a/resources/web/homepage2/left.html b/resources/web/homepage3/left.html similarity index 100% rename from resources/web/homepage2/left.html rename to resources/web/homepage3/left.html diff --git a/resources/web/include/globalapi.js b/resources/web/include/globalapi.js index e906e21c1..58b53fa2f 100644 --- a/resources/web/include/globalapi.js +++ b/resources/web/include/globalapi.js @@ -436,5 +436,50 @@ function DisableCtrlHotkey() } } } + +function OutputKey(keyCode, isCtrlDown, isShiftDown, isCmdDown) { + var tSend = {}; + tSend['sequence_id'] = Math.round(new Date() / 1000); + tSend['command'] = "get_web_shortcut"; + tSend['key_event'] = {}; + tSend['key_event']['key'] = keyCode; + tSend['key_event']['ctrl'] = isCtrlDown; + tSend['key_event']['shift'] = isShiftDown; + tSend['key_event']['cmd'] = isCmdDown; + + SendWXMessage(JSON.stringify(tSend)); +} + +function DisableHotkey( b_CtrlP ) +{ + document.onkeydown = function (event) { + var e = event || window.event || arguments.callee.caller.arguments[0]; + + if (e.ctrlKey && e.metaKey) + OutputKey(e.keyCode, true, false, true); + else if (e.ctrlKey) + OutputKey(e.keyCode, true, false, false); + else if (e.metaKey) + OutputKey(e.keyCode, false, false, true); + + if (e.shiftKey && e.ctrlKey) + OutputKey(e.keyCode, true, true, false); + + if (e.shiftKey && e.metaKey) + OutputKey(e.keyCode, false, true, true); + + if (window.event) { + try { e.keyCode = 0; } catch (e) { } + e.returnValue = false; + } + }; + + window.addEventListener('mousewheel', function (event) { + if (event.ctrlKey === true || event.metaKey) { + event.preventDefault(); + } + }, { passive: false }); +} -DisableCtrlHotkey(); \ No newline at end of file +DisableHotkey(); + diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 9b909dbec..c9e08da1b 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -35,14 +35,14 @@ namespace GUI { WebViewPanel::WebViewPanel(wxWindow *parent) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) { - wxString UrlLeft = wxString::Format("file://%s/web/homepage2/left.html", from_u8(resources_dir())); - wxString UrlRight = wxString::Format("file://%s/web/homepage2/home.html", from_u8(resources_dir())); + wxString UrlLeft = wxString::Format("file://%s/web/homepage3/left.html", from_u8(resources_dir())); + wxString UrlRight = wxString::Format("file://%s/web/homepage3/home.html", from_u8(resources_dir())); wxString strlang = wxGetApp().current_language_code_safe(); if (strlang != "") { - UrlLeft = wxString::Format("file://%s/web/homepage2/left.html?lang=%s", from_u8(resources_dir()), strlang); - UrlRight = wxString::Format("file://%s/web/homepage2/home.html?lang=%s", from_u8(resources_dir()), strlang); + UrlLeft = wxString::Format("file://%s/web/homepage3/left.html?lang=%s", from_u8(resources_dir()), strlang); + UrlRight = wxString::Format("file://%s/web/homepage3/home.html?lang=%s", from_u8(resources_dir()), strlang); } topsizer = new wxBoxSizer(wxVERTICAL); @@ -269,8 +269,18 @@ WebViewPanel::~WebViewPanel() void WebViewPanel::ResetWholePage() { + //left if (m_browserLeft != nullptr && m_leftfirst) m_browserLeft->Reload(); + //right + json m_Res = json::object(); + m_Res["command"] = "homepage_rightarea_reset"; + m_Res["sequence_id"] = "10001"; + + wxString strJS = wxString::Format("window.postMessage(%s)", m_Res.dump(-1, ' ', false, json::error_handler_t::ignore)); + RunScript(strJS); + + //online auto host = wxGetApp().get_model_http_url(wxGetApp().app_config->get_country_code()); std::string mwurl = (boost::format("%1%studio/webview?from=bambustudio") % host).str(); m_browserMW->LoadURL(mwurl); @@ -842,7 +852,7 @@ void WebViewPanel::OnNavigationRequest(wxWebViewEvent& evt) BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data(); const wxString &url = evt.GetURL(); if (url.StartsWith("File://") || url.StartsWith("file://")) { - if (!url.Contains("/web/homepage2/")) { + if (!url.Contains("/web/homepage3/")) { auto file = wxURL::Unescape(wxURL(url).GetPath()); #ifdef _WIN32 if (file.StartsWith('/')) @@ -1247,11 +1257,11 @@ void WebViewPanel::OnError(wxWebViewEvent& evt) { wxString errurl = evt.GetURL(); - wxString UrlRight = wxString::Format("file://%s/web/homepage2/disconnect.html", from_u8(resources_dir())); + wxString UrlRight = wxString::Format("file://%s/web/homepage3/disconnect.html", from_u8(resources_dir())); wxString strlang = wxGetApp().current_language_code_safe(); if (strlang != "") { - UrlRight = wxString::Format("file://%s/web/homepage2/disconnect.html?lang=%s", from_u8(resources_dir()), strlang); + UrlRight = wxString::Format("file://%s/web/homepage3/disconnect.html?lang=%s", from_u8(resources_dir()), strlang); } m_browser->LoadURL(UrlRight); @@ -1263,22 +1273,21 @@ void WebViewPanel::OnError(wxWebViewEvent& evt) UpdateState(); } -void WebViewPanel::SwitchWebContent(std::string modelname,int refresh) -{ +void WebViewPanel::SwitchWebContent(std::string modelname, int refresh) +{ m_contentname = modelname; CheckMenuNewTag(); wxString strlang = wxGetApp().current_language_code_safe(); - if (modelname.compare("makerlab")==0) { + if (modelname.compare("makerlab") == 0) { auto host = wxGetApp().get_model_http_url(wxGetApp().app_config->get_country_code()); - std::string LabUrl = (boost::format("%1%makerlab?from=bambustudio") % host ).str(); + std::string LabUrl = (boost::format("%1%makerlab?from=bambustudio") % host).str(); wxString FinalUrl = LabUrl; - NetworkAgent *agent = GUI::wxGetApp().getAgent(); - if (agent && agent->is_user_login()) - { + NetworkAgent *agent = GUI::wxGetApp().getAgent(); + if (agent && agent->is_user_login()) { std::string newticket; int ret = agent->request_bind_ticket(&newticket); if (ret == 0) GetJumpUrl(true, newticket, FinalUrl, FinalUrl); @@ -1286,17 +1295,15 @@ void WebViewPanel::SwitchWebContent(std::string modelname,int refresh) wxLaunchDefaultBrowser(FinalUrl); - //conf save + // conf save wxGetApp().app_config->set_str("homepage", "makerlab_clicked", "1"); wxGetApp().app_config->save(); wxGetApp().CallAfter([this] { ShowMenuNewTag("makerlab", "0"); }); - + return; - } - else if (modelname.compare("online") == 0) { - if (m_online_spec_id != "") - { - auto host = wxGetApp().get_model_http_url(wxGetApp().app_config->get_country_code()); + } else if (modelname.compare("online") == 0) { + if (m_online_spec_id != "") { + auto host = wxGetApp().get_model_http_url(wxGetApp().app_config->get_country_code()); wxString language_code = wxGetApp().current_language_code().BeforeFirst('_'); language_code = language_code.ToStdString(); @@ -1307,11 +1314,10 @@ void WebViewPanel::SwitchWebContent(std::string modelname,int refresh) m_browserMW->LoadURL(mwurl); SetWebviewShow("online", true); - SetWebviewShow("right", false); + SetWebviewShow("right", false); m_online_spec_id = ""; - } - else { + } else { if (m_onlinefirst == false) { m_onlinefirst = true; refresh = 1; // Force Refresh @@ -1322,7 +1328,7 @@ void WebViewPanel::SwitchWebContent(std::string modelname,int refresh) m_browserMW->Reload(); else { SetWebviewShow("online", true); - SetWebviewShow("right", false); + SetWebviewShow("right", false); } } } @@ -1333,18 +1339,21 @@ void WebViewPanel::SwitchWebContent(std::string modelname,int refresh) wxGetApp().app_config->set_str("homepage", "online_clicked", "1"); wxGetApp().app_config->save(); wxGetApp().CallAfter([this] { ShowMenuNewTag("online", "0"); }); - } - else if (modelname.compare("home") == 0 || modelname.compare("recent") == 0 || modelname.compare("manual") == 0 ) - { - wxString UrlRight = wxString::Format("file://%s/web/homepage2/%s.html", from_u8(resources_dir()), modelname); - if (strlang != "") - UrlRight = wxString::Format("%s?lang=%s", UrlRight, strlang); + } else if (modelname.compare("home") == 0 || modelname.compare("recent") == 0 || modelname.compare("manual") == 0) { + if (!m_browser) return; - if (m_browser != NULL) m_browser->LoadURL(UrlRight); + json m_Res = json::object(); + m_Res["command"] = "homepage_leftmenu_clicked"; + m_Res["sequence_id"] = "10001"; + m_Res["menu"] = modelname; + // wxString strJS = wxString::Format("HandleStudio(%s)", m_Res.dump(-1, ' ', false, json::error_handler_t::ignore)); + wxString strJS = wxString::Format("HandleStudio(%s)", m_Res.dump(-1, ' ', true)); + + WebView::RunScript(m_browser, strJS); SetWebviewShow("online", false); - SetWebviewShow("right", true); + SetWebviewShow("right", true); } }