mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Revert "Merge branch 'SoftFever' into feature/calib"
This reverts commitf5b28201fe
, reversing changes made tod9e9fb2206
. # Conflicts: # version.inc
This commit is contained in:
parent
de33c24b0a
commit
a688719e72
53 changed files with 1228 additions and 498 deletions
|
@ -1699,7 +1699,7 @@ void GUI_App::init_networking_callbacks()
|
|||
wxCommandEvent event(EVT_CONNECT_LAN_MODE_PRINT);
|
||||
|
||||
if (obj) {
|
||||
|
||||
|
||||
if (obj->is_lan_mode_printer()) {
|
||||
if (state == ConnectStatus::ConnectStatusOk) {
|
||||
obj->command_request_push_all();
|
||||
|
@ -1892,9 +1892,6 @@ void GUI_App::init_app_config()
|
|||
if (! wxGetEnv(wxS("XDG_CONFIG_HOME"), &dir) || dir.empty() )
|
||||
dir = wxFileName::GetHomeDir() + wxS("/.config");
|
||||
set_data_dir((dir + "/" + GetAppName()).ToUTF8().data());
|
||||
boost::filesystem::path data_dir_path(data_dir());
|
||||
if (!boost::filesystem::exists(data_dir_path))
|
||||
boost::filesystem::create_directory(data_dir_path);
|
||||
#endif
|
||||
} else {
|
||||
m_datadir_redefined = true;
|
||||
|
@ -2732,7 +2729,7 @@ void GUI_App::UpdateDarkUI(wxWindow* window, bool highlited/* = false*/, bool ju
|
|||
|
||||
/*if (m_is_dark_mode != dark_mode() )
|
||||
m_is_dark_mode = dark_mode();*/
|
||||
|
||||
|
||||
|
||||
if (m_is_dark_mode) {
|
||||
auto original_col = window->GetBackgroundColour();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue