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

Added comments to avoid merge conflicts. (#4301)

Browse Source
This commit is contained in:
Gilbert 2018-02-24 23:11:24 +01:00 committed by Joseph Lenox
parent ab89469494
commit d194dbbedc
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Slic3r/GUI/Preferences.pm
View File

@ -20,7 +20,7 @@ sub new {
},
label_width => 200,
);
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # version_check
opt_id => 'version_check',
type => 'bool',
label => 'Check for updates',
@ -28,35 +28,35 @@ sub new {
default => $Slic3r::GUI::Settings->{_}{version_check} // 1,
readonly => !wxTheApp->have_version_check,
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # remember_output_path
opt_id => 'remember_output_path',
type => 'bool',
label => 'Remember output directory',
tooltip => 'If this is enabled, Slic3r will prompt the last output directory instead of the one containing the input files.',
default => $Slic3r::GUI::Settings->{_}{remember_output_path},
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # autocenter
opt_id => 'autocenter',
type => 'bool',
label => 'Auto-center parts (x,y)',
tooltip => 'If this is enabled, Slic3r will auto-center objects around the print bed center.',
default => $Slic3r::GUI::Settings->{_}{autocenter},
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # autoalignz
opt_id => 'autoalignz',
type => 'bool',
label => 'Auto-align parts (z=0)',
tooltip => 'If this is enabled, Slic3r will auto-align objects z value to be on the print bed at z=0.',
default => $Slic3r::GUI::Settings->{_}{autoalignz},
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # invert_zoom
opt_id => 'invert_zoom',
type => 'bool',
label => 'Invert zoom in previews',
tooltip => 'If this is enabled, Slic3r will invert the direction of mouse-wheel zoom in preview panes.',
default => $Slic3r::GUI::Settings->{_}{invert_zoom},
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # background_processing
opt_id => 'background_processing',
type => 'bool',
label => 'Background processing',
@ -64,28 +64,28 @@ sub new {
default => $Slic3r::GUI::Settings->{_}{background_processing},
readonly => !$Slic3r::have_threads,
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # threads
opt_id => 'threads',
type => 'i',
label => 'Threads',
tooltip => $Slic3r::Config::Options->{threads}{tooltip},
default => $Slic3r::GUI::Settings->{_}{threads},
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # tabbed_preset_editors
opt_id => 'tabbed_preset_editors',
type => 'bool',
label => 'Display profile editors as tabs',
tooltip => 'When opening a profile editor, it will be shown in a dialog or in a tab according to this option.',
default => $Slic3r::GUI::Settings->{_}{tabbed_preset_editors},
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # show_host
opt_id => 'show_host',
type => 'bool',
label => 'Show Controller Tab (requires restart)',
tooltip => 'Shows/Hides the Controller Tab. Requires a restart of Slic3r.',
default => $Slic3r::GUI::Settings->{_}{show_host},
));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( # nudge_val
opt_id => 'nudge_val',
type => 's',
label => '2D plater nudge value',