GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-14 21:22:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer

Browse Source
This commit is contained in:
Enrico Turri 2019-09-24 09:11:43 +02:00
commit a68a72a660
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/admesh/stlinit.cpp
View File

@ -36,6 +36,10 @@
#error "SEEK_SET not defined" #error "SEEK_SET not defined"
#endif #endif
#ifndef BOOST_LITTLE_ENDIAN
extern void stl_internal_reverse_quads(char *buf, size_t cnt);
#endif /* BOOST_LITTLE_ENDIAN */
static FILE* stl_open_count_facets(stl_file *stl, const char *file) static FILE* stl_open_count_facets(stl_file *stl, const char *file)
{ {
// Open the file in binary mode first. // Open the file in binary mode first.
@ -238,10 +242,6 @@ bool stl_open(stl_file *stl, const char *file)
return result; return result;
} }
#ifndef BOOST_LITTLE_ENDIAN
extern void stl_internal_reverse_quads(char *buf, size_t cnt);
#endif /* BOOST_LITTLE_ENDIAN */
void stl_allocate(stl_file *stl) void stl_allocate(stl_file *stl)
{ {
// Allocate memory for the entire .STL file. // Allocate memory for the entire .STL file.

13
src/slic3r/GUI/ConfigWizard.cpp
View File

@ -1225,13 +1225,16 @@ bool ConfigWizard::run(PresetBundle *preset_bundle, const PresetUpdater *updater
const wxString& ConfigWizard::name(const bool from_menu/* = false*/) const wxString& ConfigWizard::name(const bool from_menu/* = false*/)
{ {
// A different naming convention is used for the Wizard on Windows vs. OSX & GTK. // A different naming convention is used for the Wizard on Windows & GTK vs. OSX.
// Note: Don't call _() macro here.
// This function just return the current name according to the OS.
// Translation is implemented inside GUI_App::add_config_menu()
#if __APPLE__ #if __APPLE__
static const wxString config_wizard_name = _(L("Configuration Assistant")); static const wxString config_wizard_name = L("Configuration Assistant");
static const wxString config_wizard_name_menu = _(L("Configuration &Assistant")); static const wxString config_wizard_name_menu = L("Configuration &Assistant");
#else #else
static const wxString config_wizard_name = _(L("Configuration Wizard")); static const wxString config_wizard_name = L("Configuration Wizard");
static const wxString config_wizard_name_menu = _(L("Configuration &Wizard")); static const wxString config_wizard_name_menu = L("Configuration &Wizard");
#endif #endif
return from_menu ? config_wizard_name_menu : config_wizard_name; return from_menu ? config_wizard_name_menu : config_wizard_name;
} }

8
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@ -273,6 +273,8 @@ void ObjectList::create_objects_ctrl()
AppendBitmapColumn(_(L("Editing")), colEditing, wxDATAVIEW_CELL_INERT, 3*em, AppendBitmapColumn(_(L("Editing")), colEditing, wxDATAVIEW_CELL_INERT, 3*em,
wxALIGN_CENTER_HORIZONTAL, wxDATAVIEW_COL_RESIZABLE); wxALIGN_CENTER_HORIZONTAL, wxDATAVIEW_COL_RESIZABLE);
// For some reason under OSX on 4K(5K) monitors in wxDataViewColumn constructor doesn't set width of column.
// Therefore, force set column width.
if (wxOSX) if (wxOSX)
{ {
GetColumn(colName)->SetWidth(20*em); GetColumn(colName)->SetWidth(20*em);
@ -3682,10 +3684,10 @@ void ObjectList::msw_rescale()
// update min size !!! A width of control shouldn't be a wxDefaultCoord // update min size !!! A width of control shouldn't be a wxDefaultCoord
SetMinSize(wxSize(1, 15 * em)); SetMinSize(wxSize(1, 15 * em));
GetColumn(colName)->SetWidth(19 * em); GetColumn(colName )->SetWidth(20 * em);
GetColumn(colPrint)->SetWidth( 2 * em); GetColumn(colPrint )->SetWidth( 3 * em);
GetColumn(colExtruder)->SetWidth( 8 * em); GetColumn(colExtruder)->SetWidth( 8 * em);
GetColumn(colEditing)->SetWidth( 2 * em); GetColumn(colEditing )->SetWidth( 3 * em);
// rescale all icons, used by ObjectList // rescale all icons, used by ObjectList
msw_rescale_icons(); msw_rescale_icons();