3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-20 07:11:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX:fixed some mall issues

Browse source 
1. The size of the window is scaled to 0.75
2. Add an interface to close publishing pages
3. The host chooses not to judge caching anymore

Change-Id: I8db73a94203ba427059d5121659dfdcd8d4c1940
This commit is contained in:
tao wang 2022-11-01 17:55:43 +08:00 • committed by Lane.Wei
parent 04bbcf1122
commit 752e00694a
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/ModelMall.cpp
View file

@ -152,6 +152,9 @@ namespace GUI {
if (download_url.empty()) return; if (download_url.empty()) return;
wxGetApp().plater()->request_model_download(download_url, filename); wxGetApp().plater()->request_model_download(download_url, filename);
} }
else if(strCmd == "request_close_publish_window") {
this->Hide();
}
} }
catch (std::exception& e) { catch (std::exception& e) {

6
src/slic3r/GUI/ModelMall.hpp
View file

@ -35,9 +35,9 @@
#include "Widgets/Button.hpp" #include "Widgets/Button.hpp"
#define MODEL_MALL_PAGE_SIZE wxSize(FromDIP(1400), FromDIP(1040)) #define MODEL_MALL_PAGE_SIZE wxSize(FromDIP(1400 * 0.75), FromDIP(1040 * 0.75))
#define MODEL_MALL_PAGE_CONTROL_SIZE wxSize(FromDIP(1400), FromDIP(40)) #define MODEL_MALL_PAGE_CONTROL_SIZE wxSize(FromDIP(1400 * 0.75), FromDIP(40 * 0.75))
#define MODEL_MALL_PAGE_WEB_SIZE wxSize(FromDIP(1400), FromDIP(1000)) #define MODEL_MALL_PAGE_WEB_SIZE wxSize(FromDIP(1400 * 0.75), FromDIP(1000 * 0.75))
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {

3
src/slic3r/GUI/Preferences.cpp
View file

@ -944,7 +944,8 @@ wxBoxSizer* PreferencesDialog::create_debug_page()
iot_environment_map["pre_host"] = ENV_PRE_HOST; iot_environment_map["pre_host"] = ENV_PRE_HOST;
iot_environment_map["product_host"] = ENV_PRODUCT_HOST; iot_environment_map["product_host"] = ENV_PRODUCT_HOST;
if (iot_environment_map[param] != m_iot_environment_def) { //if (iot_environment_map[param] != m_iot_environment_def) {
if (true) {
NetworkAgent* agent = wxGetApp().getAgent(); NetworkAgent* agent = wxGetApp().getAgent();
if (param == "dev_host") { if (param == "dev_host") {
app_config->set("iot_environment", ENV_DEV_HOST); app_config->set("iot_environment", ENV_DEV_HOST);